diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-30 13:01:04 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-30 13:01:04 -0800 |
| commit | 66a45cc4cc1c1f7d1ccae4d0fee261eab5560682 (patch) | |
| tree | 208dc2307a2fb9c753026bf17509a0738ada1173 /arch/x86/boot | |
| parent | 8639dad84e4fe83577006e8e2bd9da79c6c2c41e (diff) | |
| parent | b627c8b17ccacba38c975bc0f69a49fc4e5261c9 (diff) | |
| download | kernel_goldelico_gta04-66a45cc4cc1c1f7d1ccae4d0fee261eab5560682.zip kernel_goldelico_gta04-66a45cc4cc1c1f7d1ccae4d0fee261eab5560682.tar.gz kernel_goldelico_gta04-66a45cc4cc1c1f7d1ccae4d0fee261eab5560682.tar.bz2 | |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: always define DECLARE_PCI_UNMAP* macros
x86: fixup config space size of CPU functions for AMD family 11h
x86, bts: fix wrmsr and spinlock over kmalloc
x86, pebs: fix PEBS record size configuration
x86, bts: turn macro into static inline function
x86, bts: exclude ds.c from build when disabled
arch/x86/kernel/pci-calgary_64.c: change simple_strtol to simple_strtoul
x86: use limited register constraint for setnz
xen: pin correct PGD on suspend
x86: revert irq number limitation
x86: fixing __cpuinit/__init tangle, xsave_cntxt_init()
x86: fix __cpuinit/__init tangle in init_thread_xstate()
oprofile: fix an overflow in ppro code
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 0be77b3..7e8e8b2 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; } |