[src/trunk]: src/sys/arch/x86/x86 Fix merge error

[ad <ad%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/8039dab8c0ad
branches:  trunk
changeset: 933200:8039dab8c0ad
user:      ad <ad%NetBSD.org@localhost>
date:      Thu May 21 22:01:42 2020 +0000

description:
Fix merge error

diffstat:

 sys/arch/x86/x86/lapic.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 8cbd0ad5a665 -r 8039dab8c0ad sys/arch/x86/x86/lapic.c
--- a/sys/arch/x86/x86/lapic.c  Thu May 21 21:12:30 2020 +0000
+++ b/sys/arch/x86/x86/lapic.c  Thu May 21 22:01:42 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: lapic.c,v 1.81 2020/05/21 21:12:30 ad Exp $    */
+/*     $NetBSD: lapic.c,v 1.82 2020/05/21 22:01:42 ad Exp $    */
 
 /*-
  * Copyright (c) 2000, 2008, 2020 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lapic.c,v 1.81 2020/05/21 21:12:30 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lapic.c,v 1.82 2020/05/21 22:01:42 ad Exp $");
 
 #include "acpica.h"
 #include "ioapic.h"
@@ -781,7 +781,7 @@
        while (deltat > 0) {
                xtick = lapic_gettick();
                if (lapic_broken_periodic && xtick == 0 && otick == 0) {
-                       lapic_initclocks();
+                       lapic_reset();
                        xtick = lapic_gettick();
                        if (xtick == 0)
                                panic("lapic timer stopped ticking");