diff options
Diffstat (limited to 'arch/x86/boot/compressed')
| -rw-r--r-- | arch/x86/boot/compressed/kaslr.c | 2 | ||||
| -rw-r--r-- | arch/x86/boot/compressed/misc.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/boot/compressed/kaslr.c b/arch/x86/boot/compressed/kaslr.c index a2039afe14a7..fa0332dda9f2 100644 --- a/arch/x86/boot/compressed/kaslr.c +++ b/arch/x86/boot/compressed/kaslr.c @@ -670,7 +670,7 @@ static bool process_mem_region(struct mem_vector *region, return 0; } -#ifdef CONFIG_MEMORY_HOTREMOVE +#if defined(CONFIG_MEMORY_HOTREMOVE) && defined(CONFIG_ACPI) /* * If immovable memory found, filter the intersection between * immovable memory and @region. diff --git a/arch/x86/boot/compressed/misc.h b/arch/x86/boot/compressed/misc.h index 5b8d51996cdd..fd13655e0f9b 100644 --- a/arch/x86/boot/compressed/misc.h +++ b/arch/x86/boot/compressed/misc.h @@ -129,7 +129,7 @@ acpi_physical_address get_rsdp_addr(void); static inline acpi_physical_address get_rsdp_addr(void) { return 0; } #endif -#if defined(CONFIG_RANDOMIZE_BASE) && defined(CONFIG_MEMORY_HOTREMOVE) +#if defined(CONFIG_RANDOMIZE_BASE) && defined(CONFIG_MEMORY_HOTREMOVE) && defined(CONFIG_ACPI) extern struct mem_vector immovable_mem[MAX_NUMNODES*2]; int count_immovable_mem_regions(void); #else |