From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Howells Subject: [PATCH 06/22] Blackfin: Add missing dep to asm/irqflags.h Date: Fri, 27 Aug 2010 02:59:36 +0100 Message-ID: <20100827015936.27277.78015.stgit@warthog.procyon.org.uk> References: <20100827015905.27277.39167.stgit@warthog.procyon.org.uk> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20100827015905.27277.39167.stgit@warthog.procyon.org.uk> Sender: linux-kernel-owner@vger.kernel.org To: linux-arch@vger.kernel.org Cc: dhowells@redhat.com, linux-kernel@vger.kernel.org List-Id: linux-arch.vger.kernel.org Add a missing dependency (mach/blackfin.h) to asm/irqflags.h so that bfin_read_IMASK() can be used by inline functions. Signed-off-by: David Howells --- arch/blackfin/include/asm/irqflags.h | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/arch/blackfin/include/asm/irqflags.h b/arch/blackfin/include/asm/irqflags.h index 813a1af..f3ed931 100644 --- a/arch/blackfin/include/asm/irqflags.h +++ b/arch/blackfin/include/asm/irqflags.h @@ -8,6 +8,8 @@ #ifndef __ASM_BFIN_IRQFLAGS_H__ #define __ASM_BFIN_IRQFLAGS_H__ +#include + #ifdef CONFIG_SMP # include # include @@ -185,7 +187,12 @@ static inline void raw_local_irq_enable(void) bfin_sti(bfin_irq_flags); } -#define raw_local_save_flags(flags) do { (flags) = bfin_read_IMASK(); } while (0) +static inline unsigned long arch_local_save_flags(void) +{ + return bfin_read_IMASK(); +} + +#define raw_local_save_flags(flags) do { (flags) = arch_local_save_flags(); } while (0) #define raw_irqs_disabled_flags(flags) (((flags) & ~0x3f) == 0) From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com ([209.132.183.28]:1997 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754539Ab0H0B7k (ORCPT ); Thu, 26 Aug 2010 21:59:40 -0400 From: David Howells Subject: [PATCH 06/22] Blackfin: Add missing dep to asm/irqflags.h Date: Fri, 27 Aug 2010 02:59:36 +0100 Message-ID: <20100827015936.27277.78015.stgit@warthog.procyon.org.uk> In-Reply-To: <20100827015905.27277.39167.stgit@warthog.procyon.org.uk> References: <20100827015905.27277.39167.stgit@warthog.procyon.org.uk> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-arch-owner@vger.kernel.org List-ID: To: linux-arch@vger.kernel.org Cc: dhowells@redhat.com, linux-kernel@vger.kernel.org Message-ID: <20100827015936.S8iuCK9DV6PmKH18X6AtJMAI-9P1nnuszLAOc_fYiZ0@z> Add a missing dependency (mach/blackfin.h) to asm/irqflags.h so that bfin_read_IMASK() can be used by inline functions. Signed-off-by: David Howells --- arch/blackfin/include/asm/irqflags.h | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/arch/blackfin/include/asm/irqflags.h b/arch/blackfin/include/asm/irqflags.h index 813a1af..f3ed931 100644 --- a/arch/blackfin/include/asm/irqflags.h +++ b/arch/blackfin/include/asm/irqflags.h @@ -8,6 +8,8 @@ #ifndef __ASM_BFIN_IRQFLAGS_H__ #define __ASM_BFIN_IRQFLAGS_H__ +#include + #ifdef CONFIG_SMP # include # include @@ -185,7 +187,12 @@ static inline void raw_local_irq_enable(void) bfin_sti(bfin_irq_flags); } -#define raw_local_save_flags(flags) do { (flags) = bfin_read_IMASK(); } while (0) +static inline unsigned long arch_local_save_flags(void) +{ + return bfin_read_IMASK(); +} + +#define raw_local_save_flags(flags) do { (flags) = arch_local_save_flags(); } while (0) #define raw_irqs_disabled_flags(flags) (((flags) & ~0x3f) == 0)