diff options
| author | Jesper Nilsson <jesper.nilsson@axis.com> | 2010-08-04 19:23:24 +0400 |
|---|---|---|
| committer | Jesper Nilsson <jesper.nilsson@axis.com> | 2010-08-04 20:28:48 +0400 |
| commit | 028c1f6817c1ef49c61641dc1ae6c629e5bb32df (patch) | |
| tree | b21fe8ab63975791c8ddffb79c08e4b476ce120a | |
| parent | a90993c693ab7bd72bcb28b105e8dd4f0698f836 (diff) | |
| download | linux-028c1f6817c1ef49c61641dc1ae6c629e5bb32df.tar.xz | |
CRIS: Don't take faults while in_atomic
Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
| -rw-r--r-- | arch/cris/mm/fault.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/arch/cris/mm/fault.c b/arch/cris/mm/fault.c index 72dbdbf0accf..a2b4c0b8f0fd 100644 --- a/arch/cris/mm/fault.c +++ b/arch/cris/mm/fault.c @@ -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> @@ -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); |