Merge to Fedora kernel-2.6.7-1.492

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

diff --git a/include/asm-i386/mach-default/mach_apic.h b/include/asm-i386/mach-default/mach_apic.h
index 87f6887..627f1cd 100644 (file)
--- a/include/asm-i386/mach-default/mach_apic.h
+++ b/include/asm-i386/mach-default/mach_apic.h
@@ -6,12 +6,12 @@
 
 #define APIC_DFR_VALUE (APIC_DFR_FLAT)
 
-static inline cpumask_const_t target_cpus(void)
+static inline cpumask_t target_cpus(void)
 { 
 #ifdef CONFIG_SMP
-       return mk_cpumask_const(cpu_online_map);
+       return cpu_online_map;
 #else
-       return mk_cpumask_const(cpumask_of_cpu(0));
+       return cpumask_of_cpu(0);
 #endif
 } 
 #define TARGET_CPUS (target_cpus())
@@ -116,9 +116,9 @@ static inline int apic_id_registered(void)
        return physid_isset(GET_APIC_ID(apic_read(APIC_ID)), phys_cpu_present_map);
 }
 
-static inline unsigned int cpu_mask_to_apicid(cpumask_const_t cpumask)
+static inline unsigned int cpu_mask_to_apicid(cpumask_t cpumask)
 {
-       return cpus_coerce_const(cpumask);
+       return cpus_addr(cpumask)[0];
 }
 
 static inline void enable_apic_mode(void)