[PATCH] (30/43) m32r smp.h gcc4 fixes

From: Al Viro
Date: Tue Aug 23 2005 - 16:49:11 EST


extern on physid_2_cpu[] does not belong in smp.h - the thing is static.

Signed-off-by: Al Viro <viro@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>
----
diff -urN RC13-rc6-git13-alpha-constraints/arch/m32r/kernel/smpboot.c RC13-rc6-git13-m32r-smp/arch/m32r/kernel/smpboot.c
--- RC13-rc6-git13-alpha-constraints/arch/m32r/kernel/smpboot.c 2005-06-17 15:48:29.000000000 -0400
+++ RC13-rc6-git13-m32r-smp/arch/m32r/kernel/smpboot.c 2005-08-21 13:17:12.000000000 -0400
@@ -91,6 +91,7 @@

/* 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 -urN RC13-rc6-git13-alpha-constraints/include/asm-m32r/smp.h RC13-rc6-git13-m32r-smp/include/asm-m32r/smp.h
--- RC13-rc6-git13-alpha-constraints/include/asm-m32r/smp.h 2005-08-10 10:37:53.000000000 -0400
+++ RC13-rc6-git13-m32r-smp/include/asm-m32r/smp.h 2005-08-21 13:17:12.000000000 -0400
@@ -61,9 +61,7 @@
* 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)
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/