From patchwork Mon Sep 13 21:42:16 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Fleming X-Patchwork-Id: 175902 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o8DLgls0013038 for ; Mon, 13 Sep 2010 21:42:47 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755437Ab0IMVmU (ORCPT ); Mon, 13 Sep 2010 17:42:20 -0400 Received: from arkanian.console-pimps.org ([212.110.184.194]:38713 "EHLO arkanian.console-pimps.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755416Ab0IMVmT (ORCPT ); Mon, 13 Sep 2010 17:42:19 -0400 Received: by arkanian.console-pimps.org (Postfix, from userid 1002) id 91F1E4432F; Mon, 13 Sep 2010 22:42:18 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on arkanian.vm.bytemark.co.uk X-Spam-Level: X-Spam-Status: No, score=-4.3 required=5.0 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.2.5 Received: from localhost (cpc5-brad6-0-0-cust25.barn.cable.virginmedia.com [82.38.64.26]) by arkanian.console-pimps.org (Postfix) with ESMTPSA id 002864432D; Mon, 13 Sep 2010 22:42:17 +0100 (BST) Date: Mon, 13 Sep 2010 22:42:16 +0100 From: Matt Fleming To: David Howells Cc: Paul Mundt , linux-sh@vger.kernel.org Subject: Re: IRQ flags patch Message-ID: <20100913214216.GA26815@console-pimps.org> References: <6218.1284051389@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <6218.1284051389@redhat.com> User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Mon, 13 Sep 2010 21:42:48 +0000 (UTC) diff --git a/arch/sh/include/asm/irqflags.h b/arch/sh/include/asm/irqflags.h index a741153..43b7608 100644 --- a/arch/sh/include/asm/irqflags.h +++ b/arch/sh/include/asm/irqflags.h @@ -1,8 +1,8 @@ #ifndef __ASM_SH_IRQFLAGS_H #define __ASM_SH_IRQFLAGS_H -#define RAW_IRQ_DISABLED 0xf0 -#define RAW_IRQ_ENABLED 0x00 +#define ARCH_IRQ_DISABLED 0xf0 +#define ARCH_IRQ_ENABLED 0x00 #include diff --git a/arch/sh/kernel/irq_32.c b/arch/sh/kernel/irq_32.c index 14d2477..e5a755b 100644 --- a/arch/sh/kernel/irq_32.c +++ b/arch/sh/kernel/irq_32.c @@ -14,7 +14,7 @@ void notrace arch_local_irq_restore(unsigned long flags) { unsigned long __dummy0, __dummy1; - if (flags == RAW_IRQ_DISABLED) { + if (flags == ARCH_IRQ_DISABLED) { __asm__ __volatile__ ( "stc sr, %0\n\t" "or #0xf0, %0\n\t" @@ -33,14 +33,14 @@ void notrace arch_local_irq_restore(unsigned long flags) #endif "ldc %0, sr\n\t" : "=&r" (__dummy0), "=r" (__dummy1) - : "1" (~RAW_IRQ_DISABLED) + : "1" (~ARCH_IRQ_DISABLED) : "memory" ); } } EXPORT_SYMBOL(arch_local_irq_restore); -unsigned long notrace __arch_local_save_flags(void) +unsigned long notrace arch_local_save_flags(void) { unsigned long flags; @@ -54,4 +54,4 @@ unsigned long notrace __arch_local_save_flags(void) return flags; } -EXPORT_SYMBOL(__arch_local_save_flags); +EXPORT_SYMBOL(arch_local_save_flags);