X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=include%2Fasm-x86%2Fsystem_32.h;h=28978b17b07a768fc3aa0f2016be75aa5fde3641;hb=e34907ae180f4fe6c28bb4516c679c2f81b0c9ed;hp=db6283eb5e46d6f53ff24d33b0a5ec091e5a9fd0;hpb=c4ec20717313daafba59225f812db89595952b83;p=powerpc.git

diff --git a/include/asm-x86/system_32.h b/include/asm-x86/system_32.h
index db6283eb5e..28978b17b0 100644
--- a/include/asm-x86/system_32.h
+++ b/include/asm-x86/system_32.h
@@ -28,9 +28,9 @@ extern struct task_struct * FASTCALL(__switch_to(struct task_struct *prev, struc
 		     "1:\t"						\
 		     "popl %%ebp\n\t"					\
 		     "popfl"						\
-		     :"=m" (prev->thread.esp),"=m" (prev->thread.eip),	\
+		     :"=m" (prev->thread.sp),"=m" (prev->thread.ip),	\
 		      "=a" (last),"=S" (esi),"=D" (edi)			\
-		     :"m" (next->thread.esp),"m" (next->thread.eip),	\
+		     :"m" (next->thread.sp),"m" (next->thread.ip),	\
 		      "2" (prev), "d" (next));				\
 } while (0)
 
@@ -161,7 +161,7 @@ static inline void native_wbinvd(void)
 	asm volatile("wbinvd": : :"memory");
 }
 
-static inline void clflush(volatile void *__p)
+static inline void clflush(void *__p)
 {
 	asm volatile("clflush %0" : "+m" (*(char __force *)__p));
 }