1 files changed, 9 insertions, 14 deletions

diff --git a/include/asm-x86/system.h b/include/asm-x86/system.h
index ee32ef9367f4..9cff02ffe6c2 100644
--- a/include/asm-x86/system.h
+++ b/include/asm-x86/system.h
@@ -20,8 +20,8 @@
 #ifdef CONFIG_X86_32
 
 struct task_struct; /* one of the stranger aspects of C forward declarations */
-extern struct task_struct *FASTCALL(__switch_to(struct task_struct *prev,
-                                                struct task_struct *next));
+struct task_struct *__switch_to(struct task_struct *prev,
+                                struct task_struct *next);
 
 /*
  * Saving eflags is important. It switches not only IOPL between tasks,
@@ -130,10 +130,7 @@ extern void load_gs_index(unsigned);
                 "movl %k1, %%" #seg "\n\t"      \
                 "jmp 2b\n"                      \
                 ".previous\n"                   \
-                ".section __ex_table,\"a\"\n\t" \
-                _ASM_ALIGN "\n\t"               \
-                _ASM_PTR " 1b,3b\n"             \
-                ".previous"                     \
+                _ASM_EXTABLE(1b,3b)             \
                 : :"r" (value), "r" (0))
 
 
@@ -214,12 +211,10 @@ static inline unsigned long native_read_cr4_safe(void)
         /* This could fault if %cr4 does not exist. In x86_64, a cr4 always
          * exists, so it will never fail. */
 #ifdef CONFIG_X86_32
-        asm volatile("1: mov %%cr4, %0          \n"
-                "2:                             \n"
-                ".section __ex_table,\"a\"      \n"
-                ".long 1b,2b                    \n"
-                ".previous                      \n"
-                : "=r" (val), "=m" (__force_order) : "0" (0));
+        asm volatile("1: mov %%cr4, %0\n"
+                     "2:\n"
+                     _ASM_EXTABLE(1b,2b)
+                     : "=r" (val), "=m" (__force_order) : "0" (0));
 #else
         val = native_read_cr4();
 #endif
@@ -276,9 +271,9 @@ static inline void native_wbinvd(void)
 
 #endif /* __KERNEL__ */
 
-static inline void clflush(void *__p)
+static inline void clflush(volatile void *__p)
 {
-        asm volatile("clflush %0" : "+m" (*(char __force *)__p));
+        asm volatile("clflush %0" : "+m" (*(volatile char __force *)__p));
 }
 
 #define nop() __asm__ __volatile__ ("nop")