diff options
| author | Mark Brown <broonie@linaro.org> | 2013-07-19 10:42:11 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-07-19 10:42:11 +0100 |
| commit | 0b37fbf7508ff30e1d3668fea74e82f842448354 (patch) | |
| tree | 6d01fee5e95e1d4a8042ef473d61dd816b43d13e /arch/arm/mm/fault.c | |
| parent | 0a37d59e3c8c2299f8931df0cb1c0f525047fab5 (diff) | |
| parent | a88f9e27498afaea615ad3e93af4f26df1f84987 (diff) | |
Merge branch 'experimental/android-3.10' of https://android.googlesource.com/kernel/common into linux-linaro-lsk-android
Conflicts:
arch/arm/include/asm/smp.h
arch/arm/kernel/smp.c
kernel/futex.c
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 e207aa5f846..56059a5be9a 100644 --- a/arch/arm/mm/fault.c +++ b/arch/arm/mm/fault.c @@ -276,10 +276,10 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs) local_irq_enable(); /* - * If we're in an interrupt or have no user + * If we're in an interrupt, or have no irqs, or have no user * context, we must not take the fault.. */ - if (in_atomic() || !mm) + if (in_atomic() || irqs_disabled() || !mm) goto no_context; /* |