suspend: cleanup reference to swsusp_pg_dir[]

swsusp_pg_dir[] is used for suspend, but not for hibernation.
clean-up the ifdefs which worked by accident, while implying the opposite.
Delete the __nosavedata, which also implied the opposite.

Some day we may optimize CONFIG_ACPI_SLEEP to build minimal kernels
for just hibernate or just suspend but not both,
but today isn't that day.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Len Brown <len.brown@intel.com>

authored by Rafael J. Wysocki and committed by Len Brown a6eb84bc ffffa4b5

+5 -5
+5 -5
arch/x86/mm/init_32.c
··· 423 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 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 432 __attribute__ ((aligned(PAGE_SIZE))); 433 433 434 434 static inline void save_pg_dir(void) 435 435 { 436 436 memcpy(swsusp_pg_dir, swapper_pg_dir, PAGE_SIZE); 437 437 } 438 - #else 438 + #else /* !CONFIG_ACPI_SLEEP */ 439 439 static inline void save_pg_dir(void) 440 440 { 441 441 } 442 - #endif 442 + #endif /* !CONFIG_ACPI_SLEEP */ 443 443 444 444 void zap_low_mappings(void) 445 445 {