diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2017-02-15 17:46:10 -0800 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2017-02-15 17:46:10 -0800 |
| commit | 54640cfe47251cd8acd7145ff86bcaf4db0e9616 (patch) | |
| tree | 8bfe98c0f56a9447c2514d89eaf742e88acdd0a2 /arch/arm/mm/fault.c | |
| parent | 5edfa05a10a7a545f085b5bdf1a79567b4470d4e (diff) | |
| parent | 702c0ce9a7c7ad1b22883aa82d8c29eaa6e65aab (diff) | |
Merge tag 'v4.4.49' into android-4.4.y
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 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 |