diff options
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/include/asm/e820/api.h | 5 | ||||
| -rw-r--r-- | arch/x86/kernel/e820.c | 3 |
2 files changed, 0 insertions, 8 deletions
diff --git a/arch/x86/include/asm/e820/api.h b/arch/x86/include/asm/e820/api.h index e8ad6d9c9974..4895544b17ab 100644 --- a/arch/x86/include/asm/e820/api.h +++ b/arch/x86/include/asm/e820/api.h @@ -30,12 +30,7 @@ extern void e820_reserve_resources_late(void); extern void setup_memory_map(void); extern char *default_machine_specific_memory_setup(void); extern void e820_reallocate_tables(void); - -#if defined(CONFIG_X86_64) || defined(CONFIG_X86_32) && defined(CONFIG_HIBERNATION) extern void e820_mark_nosave_regions(unsigned long limit_pfn); -#else -static inline void e820_mark_nosave_regions(unsigned long limit_pfn) { } -#endif /* * Returns true iff the specified range [start,end) is completely contained inside diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c index eeb9c9963a6b..1f75b95185b8 100644 --- a/arch/x86/kernel/e820.c +++ b/arch/x86/kernel/e820.c @@ -696,8 +696,6 @@ void __init parse_e820_ext(u64 phys_addr, u32 data_len) e820_print_map("extended"); } -#if defined(CONFIG_X86_64) || \ - (defined(CONFIG_X86_32) && defined(CONFIG_HIBERNATION)) /** * Find the ranges of physical addresses that do not correspond to * e820 RAM areas and mark the corresponding pages as nosave for @@ -726,7 +724,6 @@ void __init e820_mark_nosave_regions(unsigned long limit_pfn) break; } } -#endif #ifdef CONFIG_ACPI /** |