diff options
-rw-r--r-- | arch/arm/mm/mmu.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c index 2ab5f962a053..9b36c5cb5e9f 100644 --- a/arch/arm/mm/mmu.c +++ b/arch/arm/mm/mmu.c | |||
@@ -827,7 +827,6 @@ static void __init devicemaps_init(struct machine_desc *mdesc) | |||
827 | * Allocate the vector page early. | 827 | * Allocate the vector page early. |
828 | */ | 828 | */ |
829 | vectors = alloc_bootmem_low_pages(PAGE_SIZE); | 829 | vectors = alloc_bootmem_low_pages(PAGE_SIZE); |
830 | BUG_ON(!vectors); | ||
831 | 830 | ||
832 | for (addr = VMALLOC_END; addr; addr += PGDIR_SIZE) | 831 | for (addr = VMALLOC_END; addr; addr += PGDIR_SIZE) |
833 | pmd_clear(pmd_off_k(addr)); | 832 | pmd_clear(pmd_off_k(addr)); |
@@ -912,10 +911,10 @@ void __init paging_init(struct machine_desc *mdesc) | |||
912 | top_pmd = pmd_off_k(0xffff0000); | 911 | top_pmd = pmd_off_k(0xffff0000); |
913 | 912 | ||
914 | /* | 913 | /* |
915 | * allocate the zero page. Note that we count on this going ok. | 914 | * allocate the zero page. Note that this always succeeds and |
915 | * returns a zeroed result. | ||
916 | */ | 916 | */ |
917 | zero_page = alloc_bootmem_low_pages(PAGE_SIZE); | 917 | zero_page = alloc_bootmem_low_pages(PAGE_SIZE); |
918 | memset(zero_page, 0, PAGE_SIZE); | ||
919 | empty_zero_page = virt_to_page(zero_page); | 918 | empty_zero_page = virt_to_page(zero_page); |
920 | flush_dcache_page(empty_zero_page); | 919 | flush_dcache_page(empty_zero_page); |
921 | } | 920 | } |