summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndi Kleen <andi@firstfloor.org>2010-06-10 13:10:40 +0200
committerH. Peter Anvin <hpa@linux.intel.com>2010-06-10 15:24:29 -0700
commitcf3bdc29fcbf2cb4cfa238591021d41ea8f8431f (patch)
tree7878f15e8ec2c9ad4b55b8ec1998895d739691dc
parent23b764d056bfec0a212a67229074ac281e86e021 (diff)
downloadlinux-cf3bdc29fcbf2cb4cfa238591021d41ea8f8431f.tar.bz2
x86, setup: Set ax register in boot vga query
Catch missing conversion to the register structure "glove box" scheme. Found by gcc 4.6's new warnings. Signed-off-by: Andi Kleen <ak@linux.intel.com> LKML-Reference: <20100610111040.F1781B1A2B@basil.firstfloor.org> Signed-off-by: H. Peter Anvin <hpa@zytor.com>
-rw-r--r--arch/x86/boot/video-vga.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/boot/video-vga.c b/arch/x86/boot/video-vga.c
index ed7aeff786b2..45bc9402aa49 100644
--- a/arch/x86/boot/video-vga.c
+++ b/arch/x86/boot/video-vga.c
@@ -41,13 +41,12 @@ static __videocard video_vga;
static u8 vga_set_basic_mode(void)
{
struct biosregs ireg, oreg;
- u16 ax;
u8 mode;
initregs(&ireg);
/* Query current mode */
- ax = 0x0f00;
+ ireg.ax = 0x0f00;
intcall(0x10, &ireg, &oreg);
mode = oreg.al;