aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorPaul Jackson <pj@sgi.com>2008-06-25 08:44:46 -0400
committerIngo Molnar <mingo@elte.hu>2008-07-08 07:10:41 -0400
commit200001eb140ea33477965f2050bea0dac801974b (patch)
tree00dfe5cebbf6bf26ff8dbdff03b3ae1e59234bf9 /Documentation
parent5dab8ec139be215fbaba216fb4aea914d0f4dac5 (diff)
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 <pj@sgi.com> Cc: "Yinghai Lu" <yhlu.kernel@gmail.com> Cc: "Jack Steiner" <steiner@sgi.com> Cc: "Mike Travis" <travis@sgi.com> Cc: "Huang Cc: Ying" <ying.huang@intel.com> Cc: "Andi Kleen" <andi@firstfloor.org> Cc: "Andrew Morton" <akpm@linux-foundation.org> Cc: Paul Jackson <pj@sgi.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/kernel-parameters.txt3
-rw-r--r--Documentation/x86/x86_64/uefi.txt4
2 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index da13d6d1b2b0..795c487af8e4 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -2150,6 +2150,9 @@ and is between 256 and 4096 characters. It is defined in the file
2150 usbhid.mousepoll= 2150 usbhid.mousepoll=
2151 [USBHID] The interval which mice are to be polled at. 2151 [USBHID] The interval which mice are to be polled at.
2152 2152
2153 add_efi_memmap [EFI; x86-32,X86-64] Include EFI memory map in
2154 kernel's map of available physical RAM.
2155
2153 vdso= [X86-32,SH,x86-64] 2156 vdso= [X86-32,SH,x86-64]
2154 vdso=2: enable compat VDSO (default with COMPAT_VDSO) 2157 vdso=2: enable compat VDSO (default with COMPAT_VDSO)
2155 vdso=1: enable VDSO (default) 2158 vdso=1: enable VDSO (default)
diff --git a/Documentation/x86/x86_64/uefi.txt b/Documentation/x86/x86_64/uefi.txt
index 7d77120a5184..a5e2b4fdb170 100644
--- a/Documentation/x86/x86_64/uefi.txt
+++ b/Documentation/x86/x86_64/uefi.txt
@@ -36,3 +36,7 @@ Mechanics:
36 services. 36 services.
37 noefi turn off all EFI runtime services 37 noefi turn off all EFI runtime services
38 reboot_type=k turn off EFI reboot runtime service 38 reboot_type=k turn off EFI reboot runtime service
39- If the EFI memory map has additional entries not in the E820 map,
40 you can include those entries in the kernels memory map of available
41 physical RAM by using the following kernel command line parameter.
42 add_efi_memmap include EFI memory map of available physical RAM