diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-25 08:39:55 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-25 08:39:55 -0800 |
| commit | d71eecf3b8e893757cc3dec560c96a32ac090890 (patch) | |
| tree | 5ca3ce995f506c8659753d24b911f5502b36e201 /include/asm-sparc/smp.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/smp.h')
| -rw-r--r-- | include/asm-sparc/smp.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/include/asm-sparc/smp.h b/include/asm-sparc/smp.h index 580c51d011d..98c46e3fbe8 100644 --- a/include/asm-sparc/smp.h +++ b/include/asm-sparc/smp.h @@ -81,16 +81,9 @@ static inline int smp_call_function(void (*func)(void *info), void *info, int no return 0; } -extern __volatile__ int __cpu_number_map[NR_CPUS]; -extern __volatile__ int __cpu_logical_map[NR_CPUS]; - static inline int cpu_logical_map(int cpu) { - return __cpu_logical_map[cpu]; -} -static inline int cpu_number_map(int cpu) -{ - return __cpu_number_map[cpu]; + return cpu; } static inline int hard_smp4m_processor_id(void) |