diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-24 19:10:56 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-24 19:10:56 -0400 |
| commit | 37a3cc99d5048df62bb201c0b45a51ba94497e45 (patch) | |
| tree | c129d5d04fc4eab5c8bc39fbf2203121be4d6d52 /arch/i386/boot/edd.c | |
| parent | 6e106b0d97e79f1abb60cc49a53af760950c3384 (diff) | |
| parent | 71351b98b9be6a867aa00276d67716c0728cfff7 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-x86setup
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-x86setup:
[x86 setup] Make sure AH=00h when setting a video mode
[x86 setup] Volatilize asm() statements
Diffstat (limited to 'arch/i386/boot/edd.c')
| -rw-r--r-- | arch/i386/boot/edd.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/i386/boot/edd.c b/arch/i386/boot/edd.c index 82b5c846a194..bd138e442ec2 100644 --- a/arch/i386/boot/edd.c +++ b/arch/i386/boot/edd.c | |||
| @@ -30,9 +30,9 @@ static int read_mbr(u8 devno, void *buf) | |||
| 30 | cx = 0x0001; /* Sector 0-0-1 */ | 30 | cx = 0x0001; /* Sector 0-0-1 */ |
| 31 | dx = devno; | 31 | dx = devno; |
| 32 | bx = (size_t)buf; | 32 | bx = (size_t)buf; |
| 33 | asm("pushfl; stc; int $0x13; setc %%al; popfl" | 33 | asm volatile("pushfl; stc; int $0x13; setc %%al; popfl" |
| 34 | : "+a" (ax), "+c" (cx), "+d" (dx), "+b" (bx) | 34 | : "+a" (ax), "+c" (cx), "+d" (dx), "+b" (bx) |
| 35 | : : "esi", "edi", "memory"); | 35 | : : "esi", "edi", "memory"); |
| 36 | 36 | ||
| 37 | return -(u8)ax; /* 0 or -1 */ | 37 | return -(u8)ax; /* 0 or -1 */ |
| 38 | } | 38 | } |