diff options
Diffstat (limited to 'arch/x86/mm/init_32.c')
-rw-r--r-- | arch/x86/mm/init_32.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c index da524fb22422..f2f36f8dae52 100644 --- a/arch/x86/mm/init_32.c +++ b/arch/x86/mm/init_32.c | |||
@@ -423,23 +423,23 @@ static void __init pagetable_init(void) | |||
423 | paravirt_pagetable_setup_done(pgd_base); | 423 | paravirt_pagetable_setup_done(pgd_base); |
424 | } | 424 | } |
425 | 425 | ||
426 | #if defined(CONFIG_HIBERNATION) || defined(CONFIG_ACPI) | 426 | #ifdef CONFIG_ACPI_SLEEP |
427 | /* | 427 | /* |
428 | * Swap suspend & friends need this for resume because things like the intel-agp | 428 | * ACPI suspend needs this for resume, because things like the intel-agp |
429 | * driver might have split up a kernel 4MB mapping. | 429 | * driver might have split up a kernel 4MB mapping. |
430 | */ | 430 | */ |
431 | char __nosavedata swsusp_pg_dir[PAGE_SIZE] | 431 | char swsusp_pg_dir[PAGE_SIZE] |
432 | __attribute__ ((aligned(PAGE_SIZE))); | 432 | __attribute__ ((aligned(PAGE_SIZE))); |
433 | 433 | ||
434 | static inline void save_pg_dir(void) | 434 | static inline void save_pg_dir(void) |
435 | { | 435 | { |
436 | memcpy(swsusp_pg_dir, swapper_pg_dir, PAGE_SIZE); | 436 | memcpy(swsusp_pg_dir, swapper_pg_dir, PAGE_SIZE); |
437 | } | 437 | } |
438 | #else | 438 | #else /* !CONFIG_ACPI_SLEEP */ |
439 | static inline void save_pg_dir(void) | 439 | static inline void save_pg_dir(void) |
440 | { | 440 | { |
441 | } | 441 | } |
442 | #endif | 442 | #endif /* !CONFIG_ACPI_SLEEP */ |
443 | 443 | ||
444 | void zap_low_mappings(void) | 444 | void zap_low_mappings(void) |
445 | { | 445 | { |