diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-02-15 12:01:25 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-02-15 12:01:25 +0800 |
| commit | 7428034763fada56405a2b53f30853b9d1e5c9e5 (patch) | |
| tree | cf3a7e2b0f687c5c6810fb8e20bd7d6dc4f1b299 /arch/arm/mm/fault.h | |
| parent | 8c05367bbe9c86c8c416bcccadaef4b3868437f7 (diff) | |
| parent | 57f53fd801a06aa1bfc6492737d70423ff9d3660 (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-rtlsk-v4.4-17.02-rt
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; |