diff options
author | Alex Shi <alex.shi@linaro.org> | 2017-02-15 12:01:23 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2017-02-15 12:01:23 +0800 |
commit | 26c815656d14b133b04936f384f5a55fceb2e835 (patch) | |
tree | 32a8db278aa1c4f21e05fcc12bd57c831116bb78 /arch/arm/mm/fault.h | |
parent | 106bdd9b95b3da7d762c4e0e59427444ff9f455d (diff) | |
parent | 57f53fd801a06aa1bfc6492737d70423ff9d3660 (diff) |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-androidlsk-v4.4-17.02-android
Diffstat (limited to 'arch/arm/mm/fault.h')
-rw-r--r-- | arch/arm/mm/fault.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mm/fault.h b/arch/arm/mm/fault.h index 05ec5e0df32d..78830657cab3 100644 --- a/arch/arm/mm/fault.h +++ b/arch/arm/mm/fault.h @@ -11,11 +11,15 @@ #define FSR_FS5_0 (0x3f) #ifdef CONFIG_ARM_LPAE +#define FSR_FS_AEA 17 + static inline int fsr_fs(unsigned int fsr) { return fsr & FSR_FS5_0; } #else +#define FSR_FS_AEA 22 + static inline int fsr_fs(unsigned int fsr) { return (fsr & FSR_FS3_0) | (fsr & FSR_FS4) >> 6; |