PCI: Add MSI quirk for ServerWorks HT1000 PCIX bridge.

[safe/jmp/linux-2.6] / include / asm-sparc64 / smp.h

diff --git a/include/asm-sparc64/smp.h b/include/asm-sparc64/smp.h
index c42c5a0..1c1c5ea 100644 (file)
--- a/include/asm-sparc64/smp.h
+++ b/include/asm-sparc64/smp.h
@@ -26,10 +26,11 @@
  *     Private routines/data
  */
  
-#include <asm/bitops.h>
+#include <linux/bitops.h>
 #include <asm/atomic.h>
+#include <asm/percpu.h>
 
-extern cpumask_t cpu_sibling_map[NR_CPUS];
+DECLARE_PER_CPU(cpumask_t, cpu_sibling_map);
 extern cpumask_t cpu_core_map[NR_CPUS];
 extern int sparc64_multi_core;
 
@@ -41,7 +42,7 @@ extern int hard_smp_processor_id(void);
 #define raw_smp_processor_id() (current_thread_info()->cpu)
 
 extern void smp_fill_in_sib_core_maps(void);
-extern unsigned char boot_cpu_id;
+extern void cpu_play_dead(void);
 
 #ifdef CONFIG_HOTPLUG_CPU
 extern int __cpu_disable(void);
@@ -54,7 +55,6 @@ extern void __cpu_die(unsigned int cpu);
 
 #define hard_smp_processor_id()                0
 #define smp_fill_in_sib_core_maps() do { } while (0)
-#define boot_cpu_id    (0)
 
 #endif /* !(CONFIG_SMP) */