Commit ef5ddd3d authored Apr 01, 2009 by Linus Torvalds

Merge branch 'x86-setup-for-linus' of...

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

parents 972dd435 cd670599

arch/x86/boot/memory.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -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;