Module Name: src
Committed By: ad
Date: Thu May 21 22:01:42 UTC 2020
Modified Files:
src/sys/arch/x86/x86: lapic.c
Log Message:
Fix merge error
To generate a diff of this commit:
cvs rdiff -u -r1.81 -r1.82 src/sys/arch/x86/x86/lapic.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/x86/lapic.c
diff -u src/sys/arch/x86/x86/lapic.c:1.81 src/sys/arch/x86/x86/lapic.c:1.82
--- src/sys/arch/x86/x86/lapic.c:1.81 Thu May 21 21:12:30 2020
+++ src/sys/arch/x86/x86/lapic.c Thu May 21 22:01:42 2020
@@ -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 @@ lapic_delay(unsigned int usec)
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");
