Commit 028c1f68 authored by Jesper Nilsson's avatar Jesper Nilsson

CRIS: Don't take faults while in_atomic

Signed-off-by: default avatarJesper Nilsson <jesper.nilsson@axis.com>
parent a90993c6
/* /*
* linux/arch/cris/mm/fault.c * arch/cris/mm/fault.c
*
* Copyright (C) 2000-2006 Axis Communications AB
*
* Authors: Bjorn Wesen
* *
* Copyright (C) 2000-2010 Axis Communications AB
*/ */
#include <linux/mm.h> #include <linux/mm.h>
...@@ -108,11 +105,11 @@ do_page_fault(unsigned long address, struct pt_regs *regs, ...@@ -108,11 +105,11 @@ do_page_fault(unsigned long address, struct pt_regs *regs,
info.si_code = SEGV_MAPERR; info.si_code = SEGV_MAPERR;
/* /*
* If we're in an interrupt or have no user * If we're in an interrupt or "atomic" operation or have no
* context, we must not take the fault.. * user context, we must not take the fault.
*/ */
if (in_interrupt() || !mm) if (in_atomic() || !mm)
goto no_context; goto no_context;
down_read(&mm->mmap_sem); down_read(&mm->mmap_sem);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment