diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-23 16:23:23 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-23 16:23:23 +0100 |
| commit | 1ccedb7cdba6886939dd8b4c8f965a826f696e56 (patch) | |
| tree | 0f5fc519a68faca5318c296315c9b6c502907056 /arch/x86/boot | |
| parent | x86: apic reset counter on shutdown (diff) | |
| parent | Linux 2.6.28-rc9 (diff) | |
| download | linux-1ccedb7cdba6886939dd8b4c8f965a826f696e56.tar.xz linux-1ccedb7cdba6886939dd8b4c8f965a826f696e56.zip | |
Merge commit 'v2.6.28-rc9' into x86/apic
Diffstat (limited to 'arch/x86/boot')
| -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; } |