diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-07-02 08:39:09 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-07-02 08:39:09 -0400 |
| commit | d2f6409584e2c62ffad81690562330ff3bf4a458 (patch) | |
| tree | 3bdfb97d0b51be2f7f414f2107e97603c1206abb /include/asm-i386/cpu.h | |
| parent | e1b09eba2686eca94a3a188042b518df6044a3c1 (diff) | |
| parent | 4a89a04f1ee21a7c1f4413f1ad7dcfac50ff9b63 (diff) | |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'include/asm-i386/cpu.h')
| -rw-r--r-- | include/asm-i386/cpu.h | 2 |
1 files changed, 2 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_ */ |