[src/sommerfeld_i386mp_1]: src/sys/arch/i386 Fix two bugs preventing this fro...

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

details:   https://anonhg.NetBSD.org/src/rev/62546bf65093
branches:  sommerfeld_i386mp_1
changeset: 482363:62546bf65093
user:      sommerfeld <sommerfeld%NetBSD.org@localhost>
date:      Tue Jan 09 03:29:49 2001 +0000

description:
Fix two bugs preventing this from working if !MULTIPROCESSOR
 1) ci->ci_curproc is not (yet) used in uniprocessor mode.
 2) change a "pushl cpu_info_primary" to the intended
        "pushl $cpu_info_primary" (oops)

diffstat:

 sys/arch/i386/i386/locore.s |  4 ++--
 sys/arch/i386/isa/npx.c     |  8 ++++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diffs (41 lines):

diff -r eda342b8205b -r 62546bf65093 sys/arch/i386/i386/locore.s
--- a/sys/arch/i386/i386/locore.s       Tue Jan 09 03:19:49 2001 +0000
+++ b/sys/arch/i386/i386/locore.s       Tue Jan 09 03:29:49 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore.s,v 1.215.2.20 2001/01/08 15:21:56 sommerfeld Exp $     */
+/*     $NetBSD: locore.s,v 1.215.2.21 2001/01/09 03:29:51 sommerfeld Exp $     */
 
 /*-
  * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -2554,7 +2554,7 @@
        GET_CPUINFO(%eax)
        pushl   %eax
 #else
-       pushl   _C_LABEL(cpu_info_primary)              
+       pushl   $_C_LABEL(cpu_info_primary)             
 #endif
        call    _C_LABEL(npxdna)
        addl    $4,%esp
diff -r eda342b8205b -r 62546bf65093 sys/arch/i386/isa/npx.c
--- a/sys/arch/i386/isa/npx.c   Tue Jan 09 03:19:49 2001 +0000
+++ b/sys/arch/i386/isa/npx.c   Tue Jan 09 03:29:49 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: npx.c,v 1.70.8.8 2000/08/25 03:56:24 sommerfeld Exp $  */
+/*     $NetBSD: npx.c,v 1.70.8.9 2001/01/09 03:29:49 sommerfeld Exp $  */
 
 #if 0
 #define IPRINTF(x)     printf x
@@ -379,8 +379,12 @@
        }
 
        s = splipi();           /* lock out IPI's while we clean house.. */
+#ifdef MULTIPROCESSOR
        p = ci->ci_curproc;
-
+#else
+       p = curproc;
+#endif
+       
        IPRINTF(("%s: dna for %p\n", ci->ci_dev.dv_xname, p));  
        /*
         * If someone else was using our FPU, save their state (which does an