[src/trunk]: src/sys/arch/sparc64/sparc64 Revert part of previous - the remov...

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

details:   https://anonhg.NetBSD.org/src/rev/142d96cb75cc
branches:  trunk
changeset: 749514:142d96cb75cc
user:      martin <martin%NetBSD.org@localhost>
date:      Tue Dec 01 09:26:36 2009 +0000

description:
Revert part of previous - the removal of the "first cpu to attach is
bootstrap cpu" requirement already fixed everything - no need to use
cf_unit for a bogus test here.

diffstat:

 sys/arch/sparc64/sparc64/cpu.c |  12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diffs (36 lines):

diff -r e4cf7b09e16b -r 142d96cb75cc sys/arch/sparc64/sparc64/cpu.c
--- a/sys/arch/sparc64/sparc64/cpu.c    Tue Dec 01 09:11:45 2009 +0000
+++ b/sys/arch/sparc64/sparc64/cpu.c    Tue Dec 01 09:26:36 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.c,v 1.86 2009/12/01 00:06:31 martin Exp $ */
+/*     $NetBSD: cpu.c,v 1.87 2009/12/01 09:26:36 martin Exp $ */
 
 /*
  * Copyright (c) 1996
@@ -52,7 +52,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.86 2009/12/01 00:06:31 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.87 2009/12/01 09:26:36 martin Exp $");
 
 #include "opt_multiprocessor.h"
 
@@ -190,12 +190,14 @@
        if (strcmp(cf->cf_name, ma->ma_name) != 0)
                return 0;
 
+#ifndef MULTIPROCESSOR
        /*
-        * Make sure cpu0 attaches to the currently running cpu (which
-        * is the boot cpu always, as we did not fire up others at this point)
+        * If we are going to only attach a single cpu, make sure
+        * to pick the one we are running on right now.
         */
-       if (cf->cf_unit == 0 && upaid_from_node(ma->ma_node) != CPU_UPAID)
+       if (upaid_from_node(ma->ma_node) != CPU_UPAID)
                return 0;
+#endif
 
        return 1;
 }