Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-x86setup

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-x86setup:
  [x86 setup] Make sure AH=00h when setting a video mode
  [x86 setup] Volatilize asm() statements

1 files changed, 7 insertions, 7 deletions

diff --git a/arch/i386/boot/tty.c b/arch/i386/boot/tty.c
index 9c668aad3515..f3f14bd26371 100644
--- a/arch/i386/boot/tty.c
+++ b/arch/i386/boot/tty.c
@@ -54,9 +54,9 @@ static u8 gettime(void)
         u16 ax = 0x0200;
         u16 cx, dx;
 
-        asm("int $0x1a"
-            : "+a" (ax), "=c" (cx), "=d" (dx)
-            : : "ebx", "esi", "edi");
+        asm volatile("int $0x1a"
+                     : "+a" (ax), "=c" (cx), "=d" (dx)
+                     : : "ebx", "esi", "edi");
 
         return dx >> 8;
 }
@@ -67,7 +67,7 @@ static u8 gettime(void)
 int getchar(void)
 {
         u16 ax = 0;
-        asm("int $0x16" : "+a" (ax));
+        asm volatile("int $0x16" : "+a" (ax));
 
         return ax & 0xff;
 }
@@ -75,9 +75,9 @@ int getchar(void)
 static int kbd_pending(void)
 {
         u8 pending;
-        asm("int $0x16; setnz %0"
-            : "=rm" (pending)
-            : "a" (0x0100));
+        asm volatile("int $0x16; setnz %0"
+                     : "=rm" (pending)
+                     : "a" (0x0100));
         return pending;
 }