summaryrefslogtreecommitdiff
path: root/arch/x86/boot/tty.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-12-08 15:52:00 +0300
committerIngo Molnar <mingo@elte.hu>2008-12-08 15:52:00 +0300
commit4d117c5c6b00254e51c61ff5b506ccaba21a5a03 (patch)
treeecb9d3ee4bfd9610c459c1eb0c0357c2905f3ae4 /arch/x86/boot/tty.c
parent6c415b9234a8c71f290e5d4fddc467f103f32719 (diff)
parent43714539eab42b2fa3653ea7bd667b36c2291b11 (diff)
downloadlinux-4d117c5c6b00254e51c61ff5b506ccaba21a5a03.tar.xz
Merge branch 'sched/urgent' into sched/core
Diffstat (limited to 'arch/x86/boot/tty.c')
-rw-r--r--arch/x86/boot/tty.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/boot/tty.c b/arch/x86/boot/tty.c
index 0be77b39328a..7e8e8b25f5f6 100644
--- a/arch/x86/boot/tty.c
+++ b/arch/x86/boot/tty.c
@@ -74,7 +74,7 @@ static int kbd_pending(void)
{
u8 pending;
asm volatile("int $0x16; setnz %0"
- : "=rm" (pending)
+ : "=qm" (pending)
: "a" (0x0100));
return pending;
}