Commit 9b5aaec4 authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Will Deacon
Browse files

arm64: drop duplicate definitions of ID_AA64MMFR0_TGRAN constants 



A bunch of ID_AA64MMFR0_TGRAN_* constant definitions appear twice
in arch/arm64/include/asm/sysreg.h, so drop the duplicates.

Signed-off-by: default avatarArd Biesheuvel <ardb@kernel.org>
Acked-by: default avatarMark Rutland <mark.rutland@arm.com>
Acked-by: default avatarSuzuki K Poulose <suzuki.poulose@arm.com>
Link: https://lore.kernel.org/r/20200414134706.8435-1-ardb@kernel.org


Signed-off-by: default avatarWill Deacon <will@kernel.org>
parent a2a69963

arch/arm64/include/asm/sysreg.h

+0 −11
Original line number Diff line number Diff line
@@ -804,17 +804,6 @@ 
#define ID_PFR1_SECURITY_SHIFT		4

#define ID_PFR1_PROGMOD_SHIFT		0



#define ID_AA64MMFR0_TGRAN4_SHIFT	28

#define ID_AA64MMFR0_TGRAN64_SHIFT	24

#define ID_AA64MMFR0_TGRAN16_SHIFT	20



#define ID_AA64MMFR0_TGRAN4_NI		0xf

#define ID_AA64MMFR0_TGRAN4_SUPPORTED	0x0

#define ID_AA64MMFR0_TGRAN64_NI		0xf

#define ID_AA64MMFR0_TGRAN64_SUPPORTED	0x0

#define ID_AA64MMFR0_TGRAN16_NI		0x0

#define ID_AA64MMFR0_TGRAN16_SUPPORTED	0x1



#if defined(CONFIG_ARM64_4K_PAGES)

#define ID_AA64MMFR0_TGRAN_SHIFT	ID_AA64MMFR0_TGRAN4_SHIFT

#define ID_AA64MMFR0_TGRAN_SUPPORTED	ID_AA64MMFR0_TGRAN4_SUPPORTED

CRA Git | Maintained and supported by SUSTech CRA and CCSE