diff options
| author | Al Viro <viro@www.linux.org.uk> | 2005-08-23 22:47:17 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-23 18:43:44 -0700 |
| commit | e231a9c4fdf402bcfd5a7c27be49050882631a95 (patch) | |
| tree | 2eaf41f3ade6cf44f1fd2d27e6e356c2368eb94a | |
| parent | 719e5985cf79bb60f4a28816547efd27dde178f5 (diff) | |
| download | linux-e231a9c4fdf402bcfd5a7c27be49050882631a95.tar.gz linux-e231a9c4fdf402bcfd5a7c27be49050882631a95.tar.bz2 linux-e231a9c4fdf402bcfd5a7c27be49050882631a95.zip | |
[PATCH] m32r smp.h gcc4 fixes
extern on physid_2_cpu[] does not belong in smp.h - the thing is static.
Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | arch/m32r/kernel/smpboot.c | 1 | ||||
| -rw-r--r-- | include/asm-m32r/smp.h | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/m32r/kernel/smpboot.c b/arch/m32r/kernel/smpboot.c index f9a0e723478d..640d592ea072 100644 --- a/arch/m32r/kernel/smpboot.c +++ b/arch/m32r/kernel/smpboot.c @@ -91,6 +91,7 @@ extern struct { /* which physical physical ID maps to which logical CPU number */ static volatile int physid_2_cpu[NR_CPUS]; +#define physid_to_cpu(physid) physid_2_cpu[physid] /* which logical CPU number maps to which physical ID */ volatile int cpu_2_physid[NR_CPUS]; diff --git a/include/asm-m32r/smp.h b/include/asm-m32r/smp.h index b9a20cdad65f..7885b7df84a2 100644 --- a/include/asm-m32r/smp.h +++ b/include/asm-m32r/smp.h @@ -61,9 +61,7 @@ extern physid_mask_t phys_cpu_present_map; * Some lowlevel functions might want to know about * the real CPU ID <-> CPU # mapping. */ -extern volatile int physid_2_cpu[NR_CPUS]; extern volatile int cpu_2_physid[NR_CPUS]; -#define physid_to_cpu(physid) physid_2_cpu[physid] #define cpu_to_physid(cpu_id) cpu_2_physid[cpu_id] #define raw_smp_processor_id() (current_thread_info()->cpu) |