From: Matt Fleming Date: Sat, 26 Sep 2009 19:44:05 +0000 (+0000) Subject: sh: Don't enable interrupts in the page fault path X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=421f7a5dbdd1720c718eed187c46cf202529cf7d;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git sh: Don't enable interrupts in the page fault path 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 Signed-off-by: Paul Mundt --- diff --git a/arch/sh/kernel/cpu/sh3/entry.S b/arch/sh/kernel/cpu/sh3/entry.S index 0151933e5253..bb407ef0b91e 100644 --- a/arch/sh/kernel/cpu/sh3/entry.S +++ b/arch/sh/kernel/cpu/sh3/entry.S @@ -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