diff options
| author | Thomas Gleixner <tglx@tglx.tec.linutronix.de> | 2005-06-26 17:20:36 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@mtd.linutronix.de> | 2005-06-26 17:20:36 -0400 |
| commit | 7ca6448dbfb398bba36eda3c01bc14b86c3675be (patch) | |
| tree | 82d934ebf07f22a2c64c3b6d82ec24082878b43a /include/asm-i386/cpu.h | |
| parent | f1f67a9874f1a4bba1adff6d694aa52e5f52ff1a (diff) | |
| parent | 7d681b23d6cc14a8c026ea6756242cb522cbbcae (diff) | |
Merge with rsync://fileserver/linux
Update to Linus latest
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_ */ |