tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[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>

authored by Al Viro and committed by Linus Torvalds e231a9c4 719e5985

+1 -2
unified split
+1
arch/m32r/kernel/smpboot.c
··· 91 92 /* which physical physical ID maps to which logical CPU number */ 93 static volatile int physid_2_cpu[NR_CPUS]; 94 95 /* which logical CPU number maps to which physical ID */ 96 volatile int cpu_2_physid[NR_CPUS];
··· 91 92 /* which physical physical ID maps to which logical CPU number */ 93 static volatile int physid_2_cpu[NR_CPUS]; 94 + #define physid_to_cpu(physid) physid_2_cpu[physid] 95 96 /* which logical CPU number maps to which physical ID */ 97 volatile int cpu_2_physid[NR_CPUS];
-2
include/asm-m32r/smp.h
··· 61 * Some lowlevel functions might want to know about 62 * the real CPU ID <-> CPU # mapping. 63 */ 64 - extern volatile int physid_2_cpu[NR_CPUS]; 65 extern volatile int cpu_2_physid[NR_CPUS]; 66 - #define physid_to_cpu(physid) physid_2_cpu[physid] 67 #define cpu_to_physid(cpu_id) cpu_2_physid[cpu_id] 68 69 #define raw_smp_processor_id() (current_thread_info()->cpu)
··· 61 * Some lowlevel functions might want to know about 62 * the real CPU ID <-> CPU # mapping. 63 */ 64 extern volatile int cpu_2_physid[NR_CPUS]; 65 #define cpu_to_physid(cpu_id) cpu_2_physid[cpu_id] 66 67 #define raw_smp_processor_id() (current_thread_info()->cpu)