VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)

[linux-2.6.git] / include / asm-i386 / mach-bigsmp / mach_apic.h

diff --git a/include/asm-i386/mach-bigsmp/mach_apic.h b/include/asm-i386/mach-bigsmp/mach_apic.h
index e7b7b2d..2339868 100644 (file)
--- a/include/asm-i386/mach-bigsmp/mach_apic.h
+++ b/include/asm-i386/mach-bigsmp/mach_apic.h
@@ -28,18 +28,17 @@ static inline cpumask_t target_cpus(void)
        static unsigned long cpu = NR_CPUS;
        do {
                if (cpu >= NR_CPUS)
-                       cpu = first_cpu_const(cpu_online_map);
+                       cpu = first_cpu(cpu_online_map);
                else
-                       cpu = next_cpu_const(cpu, cpu_online_map);
+                       cpu = next_cpu(cpu, cpu_online_map);
        } while (cpu >= NR_CPUS);
-       return mk_cpumask_const(cpumask_of_cpu(cpu));
+       return cpumask_of_cpu(cpu);
 }
 #define TARGET_CPUS    (target_cpus())
 
 #define INT_DELIVERY_MODE dest_Fixed
 #define INT_DEST_MODE 1     /* logical delivery broadcast to all procs */
 
-#define APIC_BROADCAST_ID     (0xff)
 static inline unsigned long check_apicid_used(physid_mask_t bitmap, int apicid)
 {
        return 0;
@@ -150,12 +149,12 @@ static inline int check_phys_apicid_present(int boot_cpu_physical_apicid)
 }
 
 /* As we are using single CPU as destination, pick only one CPU here */
-static inline unsigned int cpu_mask_to_apicid(cpumask_const_t cpumask)
+static inline unsigned int cpu_mask_to_apicid(cpumask_t cpumask)
 {
        int cpu;
        int apicid;     
 
-       cpu = first_cpu_const(cpumask);
+       cpu = first_cpu(cpumask);
        apicid = cpu_to_logical_apicid(cpu);
        return apicid;
 }