diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-01 12:52:57 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-01 12:52:57 -0700 |
| commit | ef5ddd3d591399f2c722a77bce543d20bef31663 (patch) | |
| tree | a6bec12fcf1e7533cb8a972fc1b465923e46585c /arch | |
| parent | 972dd435fb2c5da173a4c8dea44ccb8748e36d35 (diff) | |
| parent | cd670599b7b00d9263f6f11a05c0edeb9cbedaf3 (diff) | |
| download | linux-3.10-ef5ddd3d591399f2c722a77bce543d20bef31663.tar.gz linux-3.10-ef5ddd3d591399f2c722a77bce543d20bef31663.tar.bz2 linux-3.10-ef5ddd3d591399f2c722a77bce543d20bef31663.zip | |
Merge branch 'x86-setup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-setup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, setup: guard against pre-ACPI 3 e820 code not updating %ecx
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/boot/memory.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/x86/boot/memory.c b/arch/x86/boot/memory.c index d5d2360763d..5054c2ddd1a 100644 --- a/arch/x86/boot/memory.c +++ b/arch/x86/boot/memory.c @@ -31,6 +31,12 @@ static int detect_memory_e820(void) struct e820entry *desc = boot_params.e820_map; static struct e820_ext_entry buf; /* static so it is zeroed */ + /* + * Set this here so that if the BIOS doesn't change this field + * but still doesn't change %ecx, we're still okay... + */ + buf.ext_flags = 1; + do { size = sizeof buf; |