diff options
| author | Graeme Gregory <graeme.gregory@linaro.org> | 2013-09-20 10:33:05 -0500 |
|---|---|---|
| committer | Graeme Gregory <graeme.gregory@linaro.org> | 2013-09-25 14:03:38 +0100 |
| commit | 78457c01dc5f867735ecbb28b554b59fa3b9b6dd (patch) | |
| tree | 986025955b9e2ec6898e0c9828e0590ac09ae967 /arch/arm64 | |
| parent | ad0618b69b569902e9ce5217e841fde4cb122906 (diff) | |
arm: acpi: remove the ACPI blob from memory map
When booting from UEFI the ACPI regions are removed from memory map. So
to maintain compatability do the same when the ACPI region is passed
from the FDT.
Signed-off-by: Graeme Gregory <graeme.gregory@linaro.org>
Acked-by: Al Stone <al.stone@linaro.org>
Diffstat (limited to 'arch/arm64')
| -rw-r--r-- | arch/arm64/include/asm/acpi.h | 2 | ||||
| -rw-r--r-- | arch/arm64/kernel/setup.c | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm64/include/asm/acpi.h b/arch/arm64/include/asm/acpi.h index 3d37c0ea02e7..a19b73faa1fc 100644 --- a/arch/arm64/include/asm/acpi.h +++ b/arch/arm64/include/asm/acpi.h @@ -90,6 +90,8 @@ struct acpi_arm_root { }; extern struct acpi_arm_root acpi_arm_rsdp_info; +void arm_acpi_reserve_memory(void); + /* Low-level suspend routine. */ extern int acpi_suspend_lowlevel(void); diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c index fe8df3823add..3c3253d1df02 100644 --- a/arch/arm64/kernel/setup.c +++ b/arch/arm64/kernel/setup.c @@ -267,6 +267,9 @@ void __init setup_arch(char **cmdline_p) arm64_memblock_init(); +#ifdef CONFIG_ACPI + arm_acpi_reserve_memory(); +#endif paging_init(); request_standard_resources(); |