diff options
| author | Helge Deller <deller@gmx.de> | 2015-09-02 18:18:48 +0200 |
|---|---|---|
| committer | Helge Deller <deller@gmx.de> | 2015-09-08 15:30:56 +0200 |
| commit | 699817c3df46eb209044d8c9eb20c6ff6c67c81d (patch) | |
| tree | 74d6221711893ca86b50ae5f03904efe0868b4e5 /arch/parisc | |
| parent | PCI,parisc: Enable 64-bit bus addresses on PA-RISC (diff) | |
| download | linux-699817c3df46eb209044d8c9eb20c6ff6c67c81d.tar.xz linux-699817c3df46eb209044d8c9eb20c6ff6c67c81d.zip | |
parisc: Additionally check for in_atomic() in page fault handler
Craig Estey noticed that we didn't checked for in_atomic() in our page fault
handler like other architectures. This commit adds this check by using
faulthandler_disabled() which includes a check for pagefault_disabled() and
in_atomic().
Reported-by: Craig Estey <cae370@gmail.com>
Signed-off-by: Helge Deller <deller@gmx.de>
Diffstat (limited to 'arch/parisc')
| -rw-r--r-- | arch/parisc/mm/fault.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/parisc/mm/fault.c b/arch/parisc/mm/fault.c index 15503adddf4f..a762864ec92e 100644 --- a/arch/parisc/mm/fault.c +++ b/arch/parisc/mm/fault.c @@ -207,7 +207,7 @@ void do_page_fault(struct pt_regs *regs, unsigned long code, int fault; unsigned int flags; - if (pagefault_disabled()) + if (faulthandler_disabled()) goto no_context; tsk = current; |