From patchwork Sat Sep 26 19:44:05 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Fleming X-Patchwork-Id: 50269 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n8QJiiPk003779 for ; Sat, 26 Sep 2009 19:44:44 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751800AbZIZToi (ORCPT ); Sat, 26 Sep 2009 15:44:38 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751887AbZIZToi (ORCPT ); Sat, 26 Sep 2009 15:44:38 -0400 Received: from 124x34x33x190.ap124.ftth.ucom.ne.jp ([124.34.33.190]:48764 "EHLO master.linux-sh.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751800AbZIZToi (ORCPT ); Sat, 26 Sep 2009 15:44:38 -0400 Received: from localhost (unknown [127.0.0.1]) by master.linux-sh.org (Postfix) with ESMTP id A7A4B63777; Sat, 26 Sep 2009 19:44:06 +0000 (UTC) X-Virus-Scanned: amavisd-new at linux-sh.org Received: from master.linux-sh.org ([127.0.0.1]) by localhost (master.linux-sh.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 95dChE7odLNi; Sun, 27 Sep 2009 04:44:06 +0900 (JST) Received: from localhost (82-38-64-26.cable.ubr06.brad.blueyonder.co.uk [82.38.64.26]) by master.linux-sh.org (Postfix) with ESMTP id 94B0C63773; Sun, 27 Sep 2009 04:44:05 +0900 (JST) From: Matt Fleming To: Paul Mundt Cc: linux-sh@vger.kernel.org Subject: [PATCH] sh: Don't enable interrupts in the page fault path Date: Sat, 26 Sep 2009 20:44:05 +0100 Message-Id: <1253994245-3739-1-git-send-email-matt@console-pimps.org> X-Mailer: git-send-email 1.6.3.3 Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org 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 --- arch/sh/kernel/cpu/sh3/entry.S | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/arch/sh/kernel/cpu/sh3/entry.S b/arch/sh/kernel/cpu/sh3/entry.S index 0151933..bb407ef 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