Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch Use the generic i82489_writereg instead of lapic_tp...



details:   https://anonhg.NetBSD.org/src/rev/c09d5e6228b6
branches:  trunk
changeset: 348374:c09d5e6228b6
user:      maxv <maxv%NetBSD.org@localhost>
date:      Sun Oct 16 10:24:58 2016 +0000

description:
Use the generic i82489_writereg instead of lapic_tpr, for consistency.

diffstat:

 sys/arch/i386/i386/autoconf.c |  7 ++++---
 sys/arch/x86/x86/cpu.c        |  6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diffs (61 lines):

diff -r 03fcdfacff05 -r c09d5e6228b6 sys/arch/i386/i386/autoconf.c
--- a/sys/arch/i386/i386/autoconf.c     Sun Oct 16 08:23:05 2016 +0000
+++ b/sys/arch/i386/i386/autoconf.c     Sun Oct 16 10:24:58 2016 +0000
@@ -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 @@
 #endif
 
 #if NLAPIC > 0
+#include <machine/i82489reg.h>
 #include <machine/i82489var.h>
 #endif
 
@@ -130,6 +131,6 @@
 
        spl0();
 #if NLAPIC > 0
-       lapic_tpr = 0;
+       i82489_writereg(LAPIC_TPRI, 0);
 #endif
 }
diff -r 03fcdfacff05 -r c09d5e6228b6 sys/arch/x86/x86/cpu.c
--- a/sys/arch/x86/x86/cpu.c    Sun Oct 16 08:23:05 2016 +0000
+++ b/sys/arch/x86/x86/cpu.c    Sun Oct 16 10:24:58 2016 +0000
@@ -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 @@
 
        s = splhigh();
 #ifdef i386
-       lapic_tpr = 0;
+       i82489_writereg(LAPIC_TPRI, 0);
 #else
        lcr8(0);
 #endif



Home | Main Index | Thread Index | Old Index