From: Linus Torvalds Date: Wed, 1 Apr 2009 19:52:57 +0000 (-0700) Subject: Merge branch 'x86-setup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=ef5ddd3d591399f2c722a77bce543d20bef31663;hp=972dd435fb2c5da173a4c8dea44ccb8748e36d35;p=linux-2.6-omap-h63xx.git 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 --- 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;