diff options
Diffstat (limited to 'include/asm-i386')
-rw-r--r-- | include/asm-i386/cpu.h | 2 | ||||
-rw-r--r-- | include/asm-i386/irq.h | 4 | ||||
-rw-r--r-- | include/asm-i386/smp.h | 3 |
3 files changed, 9 insertions, 0 deletions
diff --git a/include/asm-i386/cpu.h b/include/asm-i386/cpu.h index 002740b21951..e7252c216ca8 100644 --- a/include/asm-i386/cpu.h +++ b/include/asm-i386/cpu.h | |||
@@ -5,6 +5,7 @@ | |||
5 | #include <linux/cpu.h> | 5 | #include <linux/cpu.h> |
6 | #include <linux/topology.h> | 6 | #include <linux/topology.h> |
7 | #include <linux/nodemask.h> | 7 | #include <linux/nodemask.h> |
8 | #include <linux/percpu.h> | ||
8 | 9 | ||
9 | #include <asm/node.h> | 10 | #include <asm/node.h> |
10 | 11 | ||
@@ -16,4 +17,5 @@ extern int arch_register_cpu(int num); | |||
16 | extern void arch_unregister_cpu(int); | 17 | extern void arch_unregister_cpu(int); |
17 | #endif | 18 | #endif |
18 | 19 | ||
20 | DECLARE_PER_CPU(int, cpu_state); | ||
19 | #endif /* _ASM_I386_CPU_H_ */ | 21 | #endif /* _ASM_I386_CPU_H_ */ |
diff --git a/include/asm-i386/irq.h b/include/asm-i386/irq.h index 05b9e61b0a72..e2d8bf23ad70 100644 --- a/include/asm-i386/irq.h +++ b/include/asm-i386/irq.h | |||
@@ -38,4 +38,8 @@ extern void release_vm86_irqs(struct task_struct *); | |||
38 | extern int irqbalance_disable(char *str); | 38 | extern int irqbalance_disable(char *str); |
39 | #endif | 39 | #endif |
40 | 40 | ||
41 | #ifdef CONFIG_HOTPLUG_CPU | ||
42 | extern void fixup_irqs(cpumask_t map); | ||
43 | #endif | ||
44 | |||
41 | #endif /* _ASM_IRQ_H */ | 45 | #endif /* _ASM_IRQ_H */ |
diff --git a/include/asm-i386/smp.h b/include/asm-i386/smp.h index 55ef31f66bbe..507f2fd39a6a 100644 --- a/include/asm-i386/smp.h +++ b/include/asm-i386/smp.h | |||
@@ -83,6 +83,9 @@ static __inline int logical_smp_processor_id(void) | |||
83 | } | 83 | } |
84 | 84 | ||
85 | #endif | 85 | #endif |
86 | |||
87 | extern int __cpu_disable(void); | ||
88 | extern void __cpu_die(unsigned int cpu); | ||
86 | #endif /* !__ASSEMBLY__ */ | 89 | #endif /* !__ASSEMBLY__ */ |
87 | 90 | ||
88 | #define NO_PROC_ID 0xFF /* No processor magic marker */ | 91 | #define NO_PROC_ID 0xFF /* No processor magic marker */ |