diff options
| author | Russell King <rmk@flint.arm.linux.org.uk> | 2004-08-07 00:10:36 +0100 |
|---|---|---|
| committer | Russell King <rmk@flint.arm.linux.org.uk> | 2004-08-07 00:10:36 +0100 |
| commit | 92ec223d707abc215716b19bc6df18f802647cc1 (patch) | |
| tree | 04312c9c00ad41b716c526c6fa7785b7d8b4dadf /arch | |
| parent | 4f1175ec436ad0b130085ede578a07d3af867a4b (diff) | |
| download | history-92ec223d707abc215716b19bc6df18f802647cc1.tar.gz | |
[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.
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mm/fault.c | 2 | ||||
| -rw-r--r-- | arch/arm/mm/init.c | 11 |
2 files changed, 2 insertions, 11 deletions
diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c index a38a1ffecbeed3..29be1c018949b6 100644 --- 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 db6ebc23672778..060fea2e10cb03 100644 --- 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. |