sh: Don't enable interrupts in the page fault path
authorMatt Fleming <matt@console-pimps.org>
Sat, 26 Sep 2009 19:44:05 +0000 (19:44 +0000)
committerPaul Mundt <lethal@linux-sh.org>
Mon, 28 Sep 2009 06:11:45 +0000 (15:11 +0900)
There's already code in do_page_fault() to conditionally enable
interrupts, so we don't need to unconditonally enable them before
calling it. This fixes a lockdep warning where we called
trace_hardirqs_off() but with irqs still enabled.

Signed-off-by: Matt Fleming <matt@console-pimps.org>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
arch/sh/kernel/cpu/sh3/entry.S

index 0151933..bb407ef 100644 (file)
@@ -152,8 +152,6 @@ call_do_page_fault:
        mov.l   1f, r0
        mov.l   @r0, r6
 
-       sti
-
        mov.l   3f, r0
        mov.l   4f, r1
        mov     r15, r4