Skip to content

Commit

Permalink
CRIS: Don't take faults while in_atomic
Browse files Browse the repository at this point in the history
Signed-off-by: Jesper Nilsson <[email protected]>
  • Loading branch information
jniax committed Aug 4, 2010
1 parent a90993c commit 028c1f6
Showing 1 changed file with 5 additions and 8 deletions.
13 changes: 5 additions & 8 deletions arch/cris/mm/fault.c
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
/*
* linux/arch/cris/mm/fault.c
*
* Copyright (C) 2000-2006 Axis Communications AB
*
* Authors: Bjorn Wesen
* arch/cris/mm/fault.c
*
* Copyright (C) 2000-2010 Axis Communications AB
*/

#include <linux/mm.h>
Expand Down Expand Up @@ -108,11 +105,11 @@ do_page_fault(unsigned long address, struct pt_regs *regs,
info.si_code = SEGV_MAPERR;

/*
* If we're in an interrupt or have no user
* context, we must not take the fault..
* If we're in an interrupt or "atomic" operation or have no
* user context, we must not take the fault.
*/

if (in_interrupt() || !mm)
if (in_atomic() || !mm)
goto no_context;

down_read(&mm->mmap_sem);
Expand Down

0 comments on commit 028c1f6

Please sign in to comment.