Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / include / asm-x86 / system.h

diff --git a/include/asm-x86/system.h b/include/asm-x86/system.h
index c4946c5964bfe2a48e5ace589b343b3fff603f7f..983ce37c491fd83504fd0a82ff3a7da15f608861 100644 (file)
--- a/include/asm-x86/system.h
+++ b/include/asm-x86/system.h
@@ -160,7 +160,7 @@ extern void native_load_gs_index(unsigned);
  * Save a segment register away
  */
 #define savesegment(seg, value)                                \
-       asm("mov %%" #seg ",%0":"=rm" (value) : : "memory")
+       asm("mov %%" #seg ",%0":"=r" (value) : : "memory")
 
 static inline unsigned long get_limit(unsigned long segment)
 {