Commit e231a9c4 authored Aug 23, 2005 by Al Viro Committed by Linus Torvalds Aug 23, 2005

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

parent 719e5985

arch/m32r/kernel/smpboot.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -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];

include/asm-m32r/smp.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -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)