diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-25 11:39:55 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-25 11:39:55 -0500 |
| commit | d71eecf3b8e893757cc3dec560c96a32ac090890 (patch) | |
| tree | 5ca3ce995f506c8659753d24b911f5502b36e201 /include/asm-sparc/cpudata.h | |
| parent | b55813a2e50088ca30df33fa62aeed5d3adb1796 (diff) | |
| parent | a54123e27779049d27d21e6c8adfee73aa2c0734 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC]: Try to start getting SMP back into shape.
Diffstat (limited to 'include/asm-sparc/cpudata.h')
| -rw-r--r-- | include/asm-sparc/cpudata.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-sparc/cpudata.h b/include/asm-sparc/cpudata.h index ec0d9ef90a3b..a2c4d51d36c4 100644 --- a/include/asm-sparc/cpudata.h +++ b/include/asm-sparc/cpudata.h | |||
| @@ -18,6 +18,7 @@ typedef struct { | |||
| 18 | unsigned int counter; | 18 | unsigned int counter; |
| 19 | int prom_node; | 19 | int prom_node; |
| 20 | int mid; | 20 | int mid; |
| 21 | int next; | ||
| 21 | } cpuinfo_sparc; | 22 | } cpuinfo_sparc; |
| 22 | 23 | ||
| 23 | DECLARE_PER_CPU(cpuinfo_sparc, __cpu_data); | 24 | DECLARE_PER_CPU(cpuinfo_sparc, __cpu_data); |