diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-28 22:24:20 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-28 22:24:20 +0400 |
| commit | ae000eec2c6aa785e1a85bea6e2f612fb826859a (patch) | |
| tree | 14ffaa202799aa1e2381a05f600c702a3c19f76b | |
| parent | cdfef17d93b35a6d583509945e699ee998abce24 (diff) | |
| parent | 4ee5b10abeb2b5581be10d3022694cd19084e9b0 (diff) | |
| download | linux-ae000eec2c6aa785e1a85bea6e2f612fb826859a.tar.xz | |
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] Correct the SMAP check for INT 0x15, AX=0xe820
| -rw-r--r-- | arch/i386/boot/memory.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/arch/i386/boot/memory.c b/arch/i386/boot/memory.c index bccaa1cf6645..378353956b5d 100644 --- a/arch/i386/boot/memory.c +++ b/arch/i386/boot/memory.c @@ -28,11 +28,14 @@ static int detect_memory_e820(void) do { size = sizeof(struct e820entry); - id = SMAP; + + /* Important: %edx is clobbered by some BIOSes, + so it must be either used for the error output + or explicitly marked clobbered. */ asm("int $0x15; setc %0" - : "=am" (err), "+b" (next), "+d" (id), "+c" (size), + : "=d" (err), "+b" (next), "=a" (id), "+c" (size), "=m" (*desc) - : "D" (desc), "a" (0xe820)); + : "D" (desc), "d" (SMAP), "a" (0xe820)); /* Some BIOSes stop returning SMAP in the middle of the search loop. We don't know exactly how the BIOS |