diff options
Diffstat (limited to 'arch/x86/mm/init_32.c')
-rw-r--r-- | arch/x86/mm/init_32.c | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c index 5d0a6711c282..0e969f9f401b 100644 --- a/arch/x86/mm/init_32.c +++ b/arch/x86/mm/init_32.c | |||
@@ -528,48 +528,6 @@ static void __init pagetable_init(void) | |||
528 | permanent_kmaps_init(pgd_base); | 528 | permanent_kmaps_init(pgd_base); |
529 | } | 529 | } |
530 | 530 | ||
531 | #ifdef CONFIG_ACPI_SLEEP | ||
532 | /* | ||
533 | * ACPI suspend needs this for resume, because things like the intel-agp | ||
534 | * driver might have split up a kernel 4MB mapping. | ||
535 | */ | ||
536 | char swsusp_pg_dir[PAGE_SIZE] | ||
537 | __attribute__ ((aligned(PAGE_SIZE))); | ||
538 | |||
539 | static inline void save_pg_dir(void) | ||
540 | { | ||
541 | copy_page(swsusp_pg_dir, swapper_pg_dir); | ||
542 | } | ||
543 | #else /* !CONFIG_ACPI_SLEEP */ | ||
544 | static inline void save_pg_dir(void) | ||
545 | { | ||
546 | } | ||
547 | #endif /* !CONFIG_ACPI_SLEEP */ | ||
548 | |||
549 | void zap_low_mappings(bool early) | ||
550 | { | ||
551 | int i; | ||
552 | |||
553 | /* | ||
554 | * Zap initial low-memory mappings. | ||
555 | * | ||
556 | * Note that "pgd_clear()" doesn't do it for | ||
557 | * us, because pgd_clear() is a no-op on i386. | ||
558 | */ | ||
559 | for (i = 0; i < KERNEL_PGD_BOUNDARY; i++) { | ||
560 | #ifdef CONFIG_X86_PAE | ||
561 | set_pgd(swapper_pg_dir+i, __pgd(1 + __pa(empty_zero_page))); | ||
562 | #else | ||
563 | set_pgd(swapper_pg_dir+i, __pgd(0)); | ||
564 | #endif | ||
565 | } | ||
566 | |||
567 | if (early) | ||
568 | __flush_tlb(); | ||
569 | else | ||
570 | flush_tlb_all(); | ||
571 | } | ||
572 | |||
573 | pteval_t __supported_pte_mask __read_mostly = ~(_PAGE_NX | _PAGE_GLOBAL | _PAGE_IOMAP); | 531 | pteval_t __supported_pte_mask __read_mostly = ~(_PAGE_NX | _PAGE_GLOBAL | _PAGE_IOMAP); |
574 | EXPORT_SYMBOL_GPL(__supported_pte_mask); | 532 | EXPORT_SYMBOL_GPL(__supported_pte_mask); |
575 | 533 | ||
@@ -882,9 +840,6 @@ void __init mem_init(void) | |||
882 | 840 | ||
883 | if (boot_cpu_data.wp_works_ok < 0) | 841 | if (boot_cpu_data.wp_works_ok < 0) |
884 | test_wp_bit(); | 842 | test_wp_bit(); |
885 | |||
886 | save_pg_dir(); | ||
887 | zap_low_mappings(true); | ||
888 | } | 843 | } |
889 | 844 | ||
890 | #ifdef CONFIG_MEMORY_HOTPLUG | 845 | #ifdef CONFIG_MEMORY_HOTPLUG |