Module Name: src
Committed By: jdolecek
Date: Sun Dec 16 20:58:00 UTC 2018
Modified Files:
src/sys/arch/x86/x86: lapic.c
Log Message:
use ci_ipending instead of ci_istate.ipending, NFC
To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 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.67 src/sys/arch/x86/x86/lapic.c:1.68
--- src/sys/arch/x86/x86/lapic.c:1.67 Sun Sep 23 00:59:59 2018
+++ src/sys/arch/x86/x86/lapic.c Sun Dec 16 20:58:00 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: lapic.c,v 1.67 2018/09/23 00:59:59 cherry Exp $ */
+/* $NetBSD: lapic.c,v 1.68 2018/12/16 20:58:00 jdolecek Exp $ */
/*-
* Copyright (c) 2000, 2008 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: lapic.c,v 1.67 2018/09/23 00:59:59 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lapic.c,v 1.68 2018/12/16 20:58:00 jdolecek Exp $");
#include "acpica.h"
#include "ioapic.h"
@@ -535,7 +535,7 @@ lapic_get_timecount(struct timecounter *
if (lapic_readreg(reg) & (1 << (LAPIC_TIMER_VECTOR % 32))) {
cur_timer -= lapic_tval;
}
- } else if (ci->ci_istate.ipending & (1 << LIR_TIMER))
+ } else if (ci->ci_ipending & (1 << LIR_TIMER))
cur_timer = lapic_gettick() - lapic_tval;
cur_timer = ci->ci_lapic_counter - cur_timer;
splx(s);
