diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-12-18 21:54:49 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-12-18 21:54:49 +0100 |
commit | d110ec3a1e1f522e2e9dfceb9c36d6590c26d2d4 (patch) | |
tree | 86b2f8f1d22b74b05239525c55bd42e3db6afc03 /arch/x86/boot/tty.c | |
parent | rcu: fix rcutorture behavior during reboot (diff) | |
parent | Merge branch 'i2c-fixes' of git://aeryn.fluff.org.uk/bjdooks/linux (diff) | |
download | linux-d110ec3a1e1f522e2e9dfceb9c36d6590c26d2d4.tar.xz linux-d110ec3a1e1f522e2e9dfceb9c36d6590c26d2d4.zip |
Merge branch 'linus' into core/rcu
Diffstat (limited to 'arch/x86/boot/tty.c')
-rw-r--r-- | arch/x86/boot/tty.c | 2 |
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; } |