Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

ARM: move FSR fault status definitions before fsr_fs()

The FSR's fault status bits depend on whether LPAE is enabled. Rather
than always exposing both LPAE and non-LPAE to all code, move them
inside the ifdef blocks dependent on LPAE to restrict their visibility.
No code other than fsr_fs() makes use of these.

Reviewed-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>

+5 -3
+5 -3
arch/arm/mm/fault.h
··· 8 8 #define FSR_LNX_PF BIT(31) 9 9 #define FSR_CM BIT(13) 10 10 #define FSR_WRITE BIT(11) 11 - #define FSR_FS4 BIT(10) 12 - #define FSR_FS3_0 GENMASK(3, 0) 13 - #define FSR_FS5_0 GENMASK(5, 0) 14 11 15 12 #ifdef CONFIG_ARM_LPAE 16 13 #define FSR_FS_AEA 17 17 14 #define FS_TRANS_NOLL 0x4 18 15 #define FS_PERM_NOLL 0xC 19 16 #define FS_MMU_NOLL_MASK 0x3C 17 + 18 + #define FSR_FS5_0 GENMASK(5, 0) 20 19 21 20 static inline int fsr_fs(unsigned int fsr) 22 21 { ··· 27 28 #define FS_L2_TRANS 0x7 28 29 #define FS_L1_PERM 0xD 29 30 #define FS_L2_PERM 0xF 31 + 32 + #define FSR_FS4 BIT(10) 33 + #define FSR_FS3_0 GENMASK(3, 0) 30 34 31 35 static inline int fsr_fs(unsigned int fsr) 32 36 {