Module Name: src
Committed By: maxv
Date: Sun Oct 16 10:24:59 UTC 2016
Modified Files:
src/sys/arch/i386/i386: autoconf.c
src/sys/arch/x86/x86: cpu.c
Log Message:
Use the generic i82489_writereg instead of lapic_tpr, for consistency.
To generate a diff of this commit:
cvs rdiff -u -r1.100 -r1.101 src/sys/arch/i386/i386/autoconf.c
cvs rdiff -u -r1.120 -r1.121 src/sys/arch/x86/x86/cpu.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/i386/i386/autoconf.c
diff -u src/sys/arch/i386/i386/autoconf.c:1.100 src/sys/arch/i386/i386/autoconf.c:1.101
--- src/sys/arch/i386/i386/autoconf.c:1.100 Wed Feb 12 23:24:09 2014
+++ src/sys/arch/i386/i386/autoconf.c Sun Oct 16 10:24:59 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.100 2014/02/12 23:24:09 dsl Exp $ */
+/* $NetBSD: autoconf.c,v 1.101 2016/10/16 10:24:59 maxv Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.100 2014/02/12 23:24:09 dsl Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.101 2016/10/16 10:24:59 maxv Exp $");
#include "opt_compat_oldboot.h"
#include "opt_intrdebug.h"
@@ -74,6 +74,7 @@ __KERNEL_RCSID(0, "$NetBSD: autoconf.c,v
#endif
#if NLAPIC > 0
+#include <machine/i82489reg.h>
#include <machine/i82489var.h>
#endif
@@ -130,6 +131,6 @@ cpu_configure(void)
spl0();
#if NLAPIC > 0
- lapic_tpr = 0;
+ i82489_writereg(LAPIC_TPRI, 0);
#endif
}
Index: src/sys/arch/x86/x86/cpu.c
diff -u src/sys/arch/x86/x86/cpu.c:1.120 src/sys/arch/x86/x86/cpu.c:1.121
--- src/sys/arch/x86/x86/cpu.c:1.120 Thu Jul 7 06:55:40 2016
+++ src/sys/arch/x86/x86/cpu.c Sun Oct 16 10:24:58 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.120 2016/07/07 06:55:40 msaitoh Exp $ */
+/* $NetBSD: cpu.c,v 1.121 2016/10/16 10:24:58 maxv Exp $ */
/*-
* Copyright (c) 2000-2012 NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.120 2016/07/07 06:55:40 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.121 2016/10/16 10:24:58 maxv Exp $");
#include "opt_ddb.h"
#include "opt_mpbios.h" /* for MPDEBUG */
@@ -877,7 +877,7 @@ cpu_hatch(void *v)
s = splhigh();
#ifdef i386
- lapic_tpr = 0;
+ i82489_writereg(LAPIC_TPRI, 0);
#else
lcr8(0);
#endif
