tree 2eaf41f3ade6cf44f1fd2d27e6e356c2368eb94a
parent 719e5985cf79bb60f4a28816547efd27dde178f5
author Al Viro <[EMAIL PROTECTED]> Tue, 23 Aug 2005 22:47:17 +0100
committer Linus Torvalds <[EMAIL PROTECTED]> Wed, 24 Aug 2005 08:43:44 -0700

[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 <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>

 arch/m32r/kernel/smpboot.c |    1 +
 include/asm-m32r/smp.h     |    2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/arch/m32r/kernel/smpboot.c b/arch/m32r/kernel/smpboot.c
--- 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
--- a/include/asm-m32r/smp.h
+++ b/include/asm-m32r/smp.h
@@ -61,9 +61,7 @@ extern physid_mask_t phys_cpu_present_ma
  * 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 git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to