From 02b5aefe00ae535f73194210003ebf50fa5f08bf Mon Sep 17 00:00:00 2001
From: Joe Perches <joe@perches.com>
Date: Sun, 23 Mar 2008 01:03:30 -0700
Subject: [PATCH] --- yaml --- r: 89022 b: refs/heads/master c:
 ceb7ce1052a9087bd4752424f253b883ec5e1cec h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/include/asm-x86/smp_64.h | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 9b47ce57c602..469d2e2059bb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2fec394adf9445ae6a21c5e67d9ad3f6f5b7c8d1
+refs/heads/master: ceb7ce1052a9087bd4752424f253b883ec5e1cec
diff --git a/trunk/include/asm-x86/smp_64.h b/trunk/include/asm-x86/smp_64.h
index fd709cbba4d1..c53a011bb91c 100644
--- a/trunk/include/asm-x86/smp_64.h
+++ b/trunk/include/asm-x86/smp_64.h
@@ -24,9 +24,9 @@ extern int smp_call_function_mask(cpumask_t mask, void (*func)(void *),
 #define raw_smp_processor_id()	read_pda(cpunumber)
 
 #define stack_smp_processor_id()					\
-	({								\
+({									\
 	struct thread_info *ti;						\
-	__asm__("andq %%rsp,%0; ":"=r" (ti) : "0" (CURRENT_MASK));	\
+	asm("andq %%rsp,%0; ":"=r" (ti) : "0" (CURRENT_MASK));	\
 	ti->cpu;							\
 })
 
@@ -46,7 +46,7 @@ static inline int num_booting_cpus(void)
 
 #define safe_smp_processor_id()		smp_processor_id()
 
-static __inline int logical_smp_processor_id(void)
+static inline int logical_smp_processor_id(void)
 {
 	/* we don't want to mark this access volatile - bad code generation */
 	return GET_APIC_LOGICAL_ID(*(u32 *)(APIC_BASE + APIC_LDR));