diff options
| author | Josh Triplett <josh@joshtriplett.org> | 2012-09-28 17:55:44 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-31 10:03:18 -0700 |
| commit | a57a57aea0ad2ced60a8aa59d49fe542f23efb72 (patch) | |
| tree | 348774a982105146820cab6908d92b4b04958e07 /init | |
| parent | 7a32a0b9985742493575ffa1c6fedf043d966708 (diff) | |
efi: Defer freeing boot services memory until after ACPI init
commit 785107923a83d8456bbd8564e288a24d84109a46 upstream.
Some new ACPI 5.0 tables reference resources stored in boot services
memory, so keep that memory around until we have ACPI and can extract
data from it.
Signed-off-by: Josh Triplett <josh@joshtriplett.org>
Link: http://lkml.kernel.org/r/baaa6d44bdc4eb0c58e5d1b4ccd2c729f854ac55.1348876882.git.josh@joshtriplett.org
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Cc: Matt Fleming <matt@console-pimps.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'init')
| -rw-r--r-- | init/main.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/init/main.c b/init/main.c index b08c5f75974f..c2178d267c1a 100644 --- a/init/main.c +++ b/init/main.c @@ -630,6 +630,9 @@ asmlinkage void __init start_kernel(void) acpi_early_init(); /* before LAPIC and SMP init */ sfi_init_late(); + if (efi_enabled) + efi_free_boot_services(); + ftrace_init(); /* Do the rest non-__init'ed, we're now alive */ |