From: Glauber Costa <gcosta@redhat.com>
Date: Thu, 27 Mar 2008 17:06:01 +0000 (-0300)
Subject: x86: split safe_smp_processor_id
X-Git-Tag: v2.6.26-rc1~1154^2~70
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=24e8ecffa84dd560e0d4d6fcaeca6950805854e7;p=linux-2.6-omap-h63xx.git

x86: split safe_smp_processor_id

This implementation in x86_64 is clean and consistent, but we
sacrifice it for the sake of being equal to i386 (since the other
way around would be harder).

Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

diff --git a/include/asm-x86/smp_64.h b/include/asm-x86/smp_64.h
index eead92e30b2..8ea49529f32 100644
--- a/include/asm-x86/smp_64.h
+++ b/include/asm-x86/smp_64.h
@@ -27,12 +27,12 @@ static inline int num_booting_cpus(void)
 	return cpus_weight(cpu_callout_map);
 }
 
+#define safe_smp_processor_id()		smp_processor_id()
 #else /* CONFIG_SMP */
 #define stack_smp_processor_id() 0
-
+#define safe_smp_processor_id() 0
 #endif /* !CONFIG_SMP */
 
-#define safe_smp_processor_id()		smp_processor_id()
 
 #endif