X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Fasm-i386%2Fcpu.h;h=9d914e1e4aad446e649dd8678d856768e637a38d;hb=refs%2Fheads%2Fvserver;hp=d962258e2a79a270e09b487a5b8b35f6fc5ae858;hpb=9213980e6a70d8473e0ffd4b39ab5b6caaba9ff5;p=linux-2.6.git

diff --git a/include/asm-i386/cpu.h b/include/asm-i386/cpu.h
index d962258e2..9d914e1e4 100644
--- a/include/asm-i386/cpu.h
+++ b/include/asm-i386/cpu.h
@@ -4,25 +4,19 @@
 #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);
+extern int enable_cpu_hotplug;
+#else
+#define enable_cpu_hotplug	0
+#endif
 
+DECLARE_PER_CPU(int, cpu_state);
 #endif /* _ASM_I386_CPU_H_ */