diff options
| author | Gary S. Robertson <gary.robertson@linaro.org> | 2013-11-06 12:37:34 -0600 |
|---|---|---|
| committer | Gary S. Robertson <gary.robertson@linaro.org> | 2013-11-06 12:37:34 -0600 |
| commit | e50ba870891ffa62aec7a2dc6306e443266d5128 (patch) | |
| tree | dd8bfbc8266d088dba3e1406c098fdc2e8004207 | |
| parent | b995b742b5930a41ade8649f4d81a641e054cec6 (diff) | |
| parent | a44933efb6f77c696dabf657c6e57e5602366624 (diff) | |
Merge branch 'linux-lng' into linux-lng-preempt-rt
| -rw-r--r-- | arch/arm/mm/fault.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c index 149bab503918..a7e70899c9a0 100644 --- a/arch/arm/mm/fault.c +++ b/arch/arm/mm/fault.c @@ -491,12 +491,14 @@ do_translation_fault(unsigned long addr, unsigned int fsr, * Some section permission faults need to be handled gracefully. * They can happen due to a __{get,put}_user during an oops. */ +#ifndef CONFIG_ARM_LPAE static int do_sect_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs) { do_bad_area(addr, fsr, regs); return 0; } +#endif /* CONFIG_ARM_LPAE */ /* * This abort handler always returns "fault". |