Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=200001...
Commit:     200001eb140ea33477965f2050bea0dac801974b
Parent:     5dab8ec139be215fbaba216fb4aea914d0f4dac5
Author:     Paul Jackson <pj@sgi.com>
AuthorDate: Wed Jun 25 05:44:46 2008 -0700
Committer:  Ingo Molnar <mingo@elte.hu>
CommitDate: Tue Jul 8 13:10:41 2008 +0200

    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>
---
 Documentation/kernel-parameters.txt |    3 +++
 Documentation/x86/x86_64/uefi.txt   |    4 ++++
 arch/x86/kernel/efi.c               |   16 ++++++++++++++--
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index da13d6d..795c487 ...
[ message continues ]