[src/netbsd-6]: src/sys/arch/xen/x86 Pull up following revision(s) (requested...

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

details:   https://anonhg.NetBSD.org/src/rev/f1eb8793a800
branches:  netbsd-6
changeset: 773818:f1eb8793a800
user:      riz <riz%NetBSD.org@localhost>
date:      Fri Feb 24 16:35:08 2012 +0000

description:
Pull up following revision(s) (requested by bouyer in ticket #45):
        sys/arch/xen/x86/cpu.c: revision 1.87
        sys/arch/xen/x86/cpu.c: revision 1.88
Get rid of phycpus_attached bitmask; it's maintained but not used and
will limit the number of physical CPUs to 32 without good reasons.
Don't maintain ci_cpumask for physical CPUs, it's not used.

diffstat:

 sys/arch/xen/x86/cpu.c |  15 ++-------------
 1 files changed, 2 insertions(+), 13 deletions(-)

diffs (50 lines):

diff -r e630ba24bf97 -r f1eb8793a800 sys/arch/xen/x86/cpu.c
--- a/sys/arch/xen/x86/cpu.c    Fri Feb 24 16:33:10 2012 +0000
+++ b/sys/arch/xen/x86/cpu.c    Fri Feb 24 16:35:08 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.c,v 1.80.2.2 2012/02/22 18:59:05 riz Exp $ */
+/*     $NetBSD: cpu.c,v 1.80.2.3 2012/02/24 16:35:08 riz Exp $ */
 /* NetBSD: cpu.c,v 1.18 2004/02/20 17:35:01 yamt Exp  */
 
 /*-
@@ -66,7 +66,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.80.2.2 2012/02/22 18:59:05 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.80.2.3 2012/02/24 16:35:08 riz Exp $");
 
 #include "opt_ddb.h"
 #include "opt_multiprocessor.h"
@@ -184,9 +184,6 @@
 uint32_t cpus_attached = 1;
 uint32_t cpus_running = 1;
 
-uint32_t phycpus_attached = 0;
-uint32_t phycpus_running = 0;
-
 uint32_t cpu_feature[5]; /* X86 CPUID feature bits
                          *     [0] basic features %edx
                          *     [1] basic features %ecx
@@ -222,11 +219,6 @@
 
        sc->sc_dev = self;
 
-       if (phycpus_attached == ~0) {
-               aprint_error(": increase MAXCPUS\n");
-               return;
-       }
-
        /*
         * If we're an Application Processor, allocate a cpu_info
         * If we're the first attached CPU use the primary cpu_info,
@@ -258,9 +250,6 @@
        ci->ci_cpuid = caa->cpu_number;
        ci->ci_vcpu = NULL;
        ci->ci_index = nphycpu++;
-       ci->ci_cpumask = (1 << cpu_index(ci));
-
-       atomic_or_32(&phycpus_attached, ci->ci_cpumask);
 
        if (!pmf_device_register(self, NULL, NULL))
                aprint_error_dev(self, "couldn't establish power handler\n");