pci, x86, acpi: fix early_ioremap() leak

[safe/jmp/linux-2.6] / arch / x86 / include / asm / es7000 / apic.h

diff --git a/arch/x86/include/asm/es7000/apic.h b/arch/x86/include/asm/es7000/apic.h
index ba8423c..c58b9cc 100644 (file)
--- a/arch/x86/include/asm/es7000/apic.h
+++ b/arch/x86/include/asm/es7000/apic.h
@@ -1,6 +1,8 @@
 #ifndef __ASM_ES7000_APIC_H
 #define __ASM_ES7000_APIC_H
 
+#include <linux/gfp.h>
+
 #define xapic_phys_to_log_apicid(cpu) per_cpu(x86_bios_cpu_apicid, cpu)
 #define esr_disable (1)
 
@@ -157,7 +159,7 @@ cpu_mask_to_apicid_cluster(const struct cpumask *cpumask)
 
        num_bits_set = cpumask_weight(cpumask);
        /* Return id to all */
-       if (num_bits_set == NR_CPUS)
+       if (num_bits_set == nr_cpu_ids)
                return 0xFF;
        /*
         * The cpus in the mask must all be on the apic cluster.  If are not
@@ -190,7 +192,7 @@ static inline unsigned int cpu_mask_to_apicid(const cpumask_t *cpumask)
 
        num_bits_set = cpus_weight(*cpumask);
        /* Return id to all */
-       if (num_bits_set == NR_CPUS)
+       if (num_bits_set == nr_cpu_ids)
                return cpu_to_logical_apicid(0);
        /*
         * The cpus in the mask must all be on the apic cluster.  If are not
@@ -214,51 +216,21 @@ static inline unsigned int cpu_mask_to_apicid(const cpumask_t *cpumask)
        return apicid;
 }
 
-static inline unsigned int cpu_mask_to_apicid_and(const struct cpumask *cpumask,
+
+static inline unsigned int cpu_mask_to_apicid_and(const struct cpumask *inmask,
                                                  const struct cpumask *andmask)
 {
-       int num_bits_set;
-       int num_bits_set2;
-       int cpus_found = 0;
-       int cpu;
-       int apicid = 0;
+       int apicid = cpu_to_logical_apicid(0);
+       cpumask_var_t cpumask;
 
-       num_bits_set = cpumask_weight(cpumask);
-       num_bits_set2 = cpumask_weight(andmask);
-       num_bits_set = min(num_bits_set, num_bits_set2);
-       /* Return id to all */
-       if (num_bits_set >= nr_cpu_ids)
-#if defined CONFIG_ES7000_CLUSTERED_APIC
-               return 0xFF;
-#else
-               return cpu_to_logical_apicid(0);
-#endif
-       /*
-        * The cpus in the mask must all be on the apic cluster.  If are not
-        * on the same apicid cluster return default value of TARGET_CPUS.
-        */
-       cpu = cpumask_first_and(cpumask, andmask);
-       apicid = cpu_to_logical_apicid(cpu);
+       if (!alloc_cpumask_var(&cpumask, GFP_ATOMIC))
+               return apicid;
 
-       while (cpus_found < num_bits_set) {
-               if (cpumask_test_cpu(cpu, cpumask) &&
-                   cpumask_test_cpu(cpu, andmask)) {
-                       int new_apicid = cpu_to_logical_apicid(cpu);
-                       if (apicid_cluster(apicid) !=
-                                       apicid_cluster(new_apicid)) {
-                               printk(KERN_WARNING
-                                       "%s: Not a valid mask!\n", __func__);
-#if defined CONFIG_ES7000_CLUSTERED_APIC
-                               return 0xFF;
-#else
-                               return cpu_to_logical_apicid(0);
-#endif
-                       }
-                       apicid = new_apicid;
-                       cpus_found++;
-               }
-               cpu++;
-       }
+       cpumask_and(cpumask, inmask, andmask);
+       cpumask_and(cpumask, cpumask, cpu_online_mask);
+       apicid = cpu_mask_to_apicid(cpumask);
+
+       free_cpumask_var(cpumask);
        return apicid;
 }