[PATCH] remove sparc64's num_possible_cpus()

Levent Serinol <levent.serinol@mynet.com> found that the hotplug cpu
patch broke Sparc64.  I introduced a num_possible_cpus(), which
Sparc64 already has.  Remove the Sparc64 one.

I also removed Sparc64's cpu_online() macro: it's in linux/cpumask.h
already.

diff --git a/arch/sparc64/kernel/smp.c b/arch/sparc64/kernel/smp.c
index 6b5ae9dbaa3926caab46ffafe3a0da6e670ccda0..2e8b578e8459ea28396a22e0ba33680bd7a09f60 100644 (file)
--- a/arch/sparc64/kernel/smp.c
+++ b/arch/sparc64/kernel/smp.c
@@ -46,7 +46,6 @@ extern void calibrate_delay(void);
 static unsigned char boot_cpu_id;
 
 cpumask_t cpu_online_map = CPU_MASK_NONE;
-atomic_t sparc64_num_cpus_possible = ATOMIC_INIT(0);
 cpumask_t phys_cpu_present_map = CPU_MASK_NONE;
 static cpumask_t smp_commenced_mask;
 static cpumask_t cpu_callout_map;
@@ -1236,20 +1235,17 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
 
        instance = 0;
        while (!cpu_find_by_instance(instance, NULL, &mid)) {
-               if (mid < max_cpus) {
+               if (mid < max_cpus)
                        cpu_set(mid, phys_cpu_present_map);
-                       atomic_inc(&sparc64_num_cpus_possible);
-               }
                instance++;
        }
 
-       if (atomic_read(&sparc64_num_cpus_possible) > max_cpus) {
+       if (num_possible_cpus() > max_cpus) {
                instance = 0;
                while (!cpu_find_by_instance(instance, NULL, &mid)) {
                        if (mid != boot_cpu_id) {
                                cpu_clear(mid, phys_cpu_present_map);
-                               atomic_dec(&sparc64_num_cpus_possible);
-                               if (atomic_read(&sparc64_num_cpus_possible) <= max_cpus)
+                               if (num_possible_cpus() <= max_cpus)
                                        break;
                        }
                        instance++;

diff --git a/arch/sparc64/kernel/sparc64_ksyms.c b/arch/sparc64/kernel/sparc64_ksyms.c
index 6e7b36e0288da838243b2323a167eeddfa1e3f2e..30b2417f13b6d6eec9d689121d574db6ad0371f4 100644 (file)
--- a/arch/sparc64/kernel/sparc64_ksyms.c
+++ b/arch/sparc64/kernel/sparc64_ksyms.c
@@ -145,7 +145,6 @@ EXPORT_SYMBOL_NOVERS(mcount);
 /* CPU online map and active count.  */
 EXPORT_SYMBOL(cpu_online_map);
 EXPORT_SYMBOL(phys_cpu_present_map);
-EXPORT_SYMBOL(sparc64_num_cpus_possible);
 
 /* Spinlock debugging library, optional. */
 #ifdef CONFIG_DEBUG_SPINLOCK

diff --git a/include/asm-sparc64/smp.h b/include/asm-sparc64/smp.h
index 1ad4911ef0de33fa3e339b10c1d3bf690be054c8..4836362c0c494dbc96434fecc2cfad0b0a615fcf 100644 (file)
--- a/include/asm-sparc64/smp.h
+++ b/include/asm-sparc64/smp.h
@@ -35,11 +35,6 @@ extern unsigned char boot_cpu_id;
 extern cpumask_t phys_cpu_present_map;
 #define cpu_possible_map phys_cpu_present_map
 
-#define cpu_online(cpu)                cpu_isset(cpu, cpu_online_map)
-
-extern atomic_t sparc64_num_cpus_possible;
-#define num_possible_cpus()    (atomic_read(&sparc64_num_cpus_possible))
-
 /*
  *     General functions that each host system must provide.
  */
@@ -75,10 +70,6 @@ static __inline__ int hard_smp_processor_id(void)
 
 #endif /* !(__ASSEMBLY__) */
 
-#else
-
-#define num_possible_cpus()    (1)
-
 #endif /* !(CONFIG_SMP) */
 
 #define NO_PROC_ID             0xFF