diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-08-25 10:59:19 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-08-25 10:59:19 +0300 |
| commit | 8d58b66ed2b000f27658c88a4ed70e8042e86a58 (patch) | |
| tree | 5bae2c74f932b5d863f72cb698a6f71260340b26 /arch/ia64/mm/fault.c | |
| parent | 13fe86f465b72fc9328d4f5ebc33223c011852ae (diff) | |
| parent | c13dcf9f2d6f5f06ef1bf79ec456df614c5e058b (diff) | |
| download | linux-8d58b66ed2b000f27658c88a4ed70e8042e86a58.tar.xz | |
Merge tag 'v4.2-rc8' into x86/mm, before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/ia64/mm/fault.c')
| -rw-r--r-- | arch/ia64/mm/fault.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/mm/fault.c b/arch/ia64/mm/fault.c index ba5ba7accd0d..70b40d1205a6 100644 --- a/arch/ia64/mm/fault.c +++ b/arch/ia64/mm/fault.c @@ -11,10 +11,10 @@ #include <linux/kprobes.h> #include <linux/kdebug.h> #include <linux/prefetch.h> +#include <linux/uaccess.h> #include <asm/pgtable.h> #include <asm/processor.h> -#include <asm/uaccess.h> extern int die(char *, struct pt_regs *, long); @@ -96,7 +96,7 @@ ia64_do_page_fault (unsigned long address, unsigned long isr, struct pt_regs *re /* * If we're in an interrupt or have no user context, we must not take the fault.. */ - if (in_atomic() || !mm) + if (faulthandler_disabled() || !mm) goto no_context; #ifdef CONFIG_VIRTUAL_MEM_MAP |