Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...

[linux-2.6.git] / include / asm-i386 / cpu.h

diff --git a/include/asm-i386/cpu.h b/include/asm-i386/cpu.h
index d962258..b1bc7b1 100644 (file)
--- a/include/asm-i386/cpu.h
+++ b/include/asm-i386/cpu.h
@@ -4,25 +4,16 @@
 #include <linux/device.h>
 #include <linux/cpu.h>
 #include <linux/topology.h>
-
-#include <asm/node.h>
+#include <linux/nodemask.h>
+#include <linux/percpu.h>
 
 struct i386_cpu {
        struct cpu cpu;
 };
-extern struct i386_cpu cpu_devices[NR_CPUS];
-
-
-static inline int arch_register_cpu(int num){
-       struct node *parent = NULL;
-       
-#ifdef CONFIG_NUMA
-       int node = cpu_to_node(num);
-       if (node_online(node))
-               parent = &node_devices[node].node;
-#endif /* CONFIG_NUMA */
-
-       return register_cpu(&cpu_devices[num].cpu, num, parent);
-}
+extern int arch_register_cpu(int num);
+#ifdef CONFIG_HOTPLUG_CPU
+extern void arch_unregister_cpu(int);
+#endif
 
+DECLARE_PER_CPU(int, cpu_state);
 #endif /* _ASM_I386_CPU_H_ */