git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
002740b
..
b1bc7b1
100644
(file)
--- a/
include/asm-i386/cpu.h
+++ b/
include/asm-i386/cpu.h
@@
-5,8
+5,7
@@
#include <linux/cpu.h>
#include <linux/topology.h>
#include <linux/nodemask.h>
#include <linux/cpu.h>
#include <linux/topology.h>
#include <linux/nodemask.h>
-
-#include <asm/node.h>
+#include <linux/percpu.h>
struct i386_cpu {
struct cpu cpu;
struct i386_cpu {
struct cpu cpu;
@@
-16,4
+15,5
@@
extern int arch_register_cpu(int num);
extern void arch_unregister_cpu(int);
#endif
extern void arch_unregister_cpu(int);
#endif
+DECLARE_PER_CPU(int, cpu_state);
#endif /* _ASM_I386_CPU_H_ */
#endif /* _ASM_I386_CPU_H_ */