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.c | |
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.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 506c225c66cc..c73f10c1984f 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 |