diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-02-15 12:01:20 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-02-15 12:01:20 +0800 |
| commit | 57f53fd801a06aa1bfc6492737d70423ff9d3660 (patch) | |
| tree | e6b474e434e57a7c800e192000572b61869543c8 /arch/arm/mm/fault.c | |
| parent | fd0d0fd17f47e0015e5be2a1e58434144a5f99e0 (diff) | |
| parent | 702c0ce9a7c7ad1b22883aa82d8c29eaa6e65aab (diff) | |
Merge tag 'v4.4.49' into linux-linaro-lsk-v4.4
This is the 4.4.49 stable release
Diffstat (limited to 'arch/arm/mm/fault.c')
| -rw-r--r-- | arch/arm/mm/fault.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c index daafcf121ce0..c095455d496e 100644 --- a/arch/arm/mm/fault.c +++ b/arch/arm/mm/fault.c @@ -610,9 +610,9 @@ static int __init early_abort_handler(unsigned long addr, unsigned int fsr, void __init early_abt_enable(void) { - fsr_info[22].fn = early_abort_handler; + fsr_info[FSR_FS_AEA].fn = early_abort_handler; local_abt_enable(); - fsr_info[22].fn = do_bad; + fsr_info[FSR_FS_AEA].fn = do_bad; } #ifndef CONFIG_ARM_LPAE |