From: Catalin Marinas Date: Tue, 15 Jul 2014 14:46:02 +0000 (+0100) Subject: arm64: Remove duplicate (SWAPPER|IDMAP)_DIR_SIZE definitions X-Git-Tag: firefly_0821_release~3680^2~36^2~24^2~16 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a39a796dd388d14a65d26753a3430be66a100265;p=firefly-linux-kernel-4.4.55.git arm64: Remove duplicate (SWAPPER|IDMAP)_DIR_SIZE definitions Just keep the asm/page.h definition as this is included in vmlinux.lds.S as well. Signed-off-by: Catalin Marinas Acked-by: Mark Rutland (cherry picked from commit b2f8c07bcb7d1a3575f41444d2d8048d0c922762) Signed-off-by: Mark Brown --- diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h index b3f6193036a8..d786b8940bbe 100644 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@ -376,9 +376,6 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot) extern pgd_t swapper_pg_dir[PTRS_PER_PGD]; extern pgd_t idmap_pg_dir[PTRS_PER_PGD]; -#define SWAPPER_DIR_SIZE (3 * PAGE_SIZE) -#define IDMAP_DIR_SIZE (2 * PAGE_SIZE) - /* * Encode and decode a swap entry: * bits 0-1: present (must be zero)