x86 boot: only pick up additional EFI memmap if add_efi_memmap flag

Applies on top of the previous patch:
  x86 boot: add code to add BIOS provided EFI memory entries to kernel

Instead of always adding EFI memory map entries (if present) to the
memory map after initially finding either E820 BIOS memory map entries
and/or kernel command line memmap entries, -instead- only add such
additional EFI memory map entries if the kernel boot option:

    add_efi_memmap

is specified.

Requiring this 'add_efi_memmap' option is backward compatible with
kernels that didn't load such additional EFI memory map entries in
the first place, and it doesn't override a configuration that tries
to replace all E820 or EFI BIOS memory map entries with ones given
entirely on the kernel command line.

Signed-off-by: Paul Jackson <[email protected]>
Cc: "Yinghai Lu" <[email protected]>
Cc: "Jack Steiner" <[email protected]>
Cc: "Mike Travis" <[email protected]>
Cc: "Huang
Cc: Ying" <[email protected]>
Cc: "Andi Kleen" <[email protected]>
Cc: "Andrew Morton" <[email protected]>
Cc: Paul Jackson <[email protected]>
Signed-off-by: Ingo Molnar <[email protected]>
This commit is contained in:
Paul Jackson 2008-06-25 05:44:46 -07:00 • committed by Ingo Molnar
commit 200001eb14
3 changed files with 21 additions and 2 deletions

View file

@ -2150,6 +2150,9 @@ and is between 256 and 4096 characters. It is defined in the file
usbhid.mousepoll=
[USBHID] The interval which mice are to be polled at.
add_efi_memmap [EFI; x86-32,X86-64] Include EFI memory map in
kernel's map of available physical RAM.
vdso= [X86-32,SH,x86-64]
vdso=2: enable compat VDSO (default with COMPAT_VDSO)
vdso=1: enable VDSO (default)