]> err.no Git - linux-2.6/commitdiff
MN10300: Change the fault handler to check in_atomic() not in_interrupt()
authorDavid Howells <dhowells@redhat.com>
Thu, 11 Sep 2008 16:18:56 +0000 (17:18 +0100)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 11 Sep 2008 17:36:08 +0000 (10:36 -0700)
Change the MN10300 fault handler to make it check in_atomic() rather than
in_interrupt() as commit 6edaf68a87d17570790fd55f0c451a29ec1d6703 did for other
architectures:

Author: Peter Zijlstra <a.p.zijlstra@chello.nl>
Date:   Wed Dec 6 20:32:18 2006 -0800

[PATCH] mm: arch do_page_fault() vs in_atomic()

In light of the recent pagefault and filemap_copy_from_user work I've
gone through all the arch pagefault handlers to make sure the
inc_preempt_count() 'feature' works as expected.

Several sections of code (including the new filemap_copy_from_user)
rely on the fact that faults do not take locks under increased preempt
count.

Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
arch/mn10300/mm/fault.c

index 78f092ca031626d5e22c2514ad225ce38e2530e1..33cf25025dac22f86dad42a8ebf8cef489db8779 100644 (file)
@@ -174,7 +174,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long fault_code,
         * If we're in an interrupt 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);