[ARM] Remove unnecessary CONFIG_CPU_32 preprocessor conditional.

We're only 32-bit ARMs, so testing this symbol in 32-bit only code
is unnecessary.

diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c
index a38a1ffecbeed34008a9804b72a5d348e9091dd9..29be1c018949b6ef379216000dc45031c46521db 100644 (file)
--- a/arch/arm/mm/fault.c
+++ b/arch/arm/mm/fault.c
@@ -66,9 +66,7 @@ void show_pte(struct mm_struct *mm, unsigned long addr)
                /* We must not map this if we have highmem enabled */
                pte = pte_offset_map(pmd, addr);
                printk(", *pte=%08lx", pte_val(*pte));
-#ifdef CONFIG_CPU_32
                printk(", *ppte=%08lx", pte_val(pte[-PTRS_PER_PTE]));
-#endif
                pte_unmap(pte);
 #endif
        } while(0);

diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
index db6ebc23672778de13c9ecc363f792336eeddfab..060fea2e10cb03eac364ca35974a97c150bc7e4d 100644 (file)
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@ -24,13 +24,7 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
-#ifdef CONFIG_CPU_32
-#define TABLE_OFFSET   (PTRS_PER_PTE)
-#else
-#define TABLE_OFFSET   0
-#endif
-
-#define TABLE_SIZE     ((TABLE_OFFSET + PTRS_PER_PTE) * sizeof(pte_t))
+#define TABLE_SIZE     (2 * PTRS_PER_PTE * sizeof(pte_t))
 
 DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
 
@@ -289,14 +283,13 @@ static __init void reserve_node_zero(unsigned int bootmap_pfn, unsigned int boot
         */
        reserve_bootmem_node(pgdat, __pa(&_stext), &_end - &_stext);
 
-#ifdef CONFIG_CPU_32
        /*
         * Reserve the page tables.  These are already in use,
         * and can only be in node 0.
         */
        reserve_bootmem_node(pgdat, __pa(swapper_pg_dir),
                             PTRS_PER_PGD * sizeof(pgd_t));
-#endif
+
        /*
         * And don't forget to reserve the allocator bitmap,
         * which will be freed later.