From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755787Ab0IJQZj (ORCPT ); Fri, 10 Sep 2010 12:25:39 -0400 Received: from mx1.redhat.com ([209.132.183.28]:31401 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755770Ab0IJQZh (ORCPT ); Fri, 10 Sep 2010 12:25:37 -0400 Organization: Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 3798903 From: David Howells Subject: [PATCH 15/17] Fix SH irqflags. To: linux-arch@vger.kernel.org Cc: torvalds@osdl.org, linux-kernel@vger.kernel.org, Paul Mundt , linux-sh@vger.kernel.org Date: Fri, 10 Sep 2010 17:25:24 +0100 Message-ID: <20100910162524.20817.26196.stgit@warthog.procyon.org.uk> In-Reply-To: <20100910162407.20817.34359.stgit@warthog.procyon.org.uk> References: <20100910162407.20817.34359.stgit@warthog.procyon.org.uk> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This (sub)patch is separated out for reviewing purposes. Once ACK'd it will need to be rolled into the main patch. Cc: Paul Mundt Cc: linux-sh@vger.kernel.org --- arch/sh/kernel/irq_32.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/sh/kernel/irq_32.c b/arch/sh/kernel/irq_32.c index e33ab15..14d2477 100644 --- a/arch/sh/kernel/irq_32.c +++ b/arch/sh/kernel/irq_32.c @@ -10,7 +10,7 @@ #include #include -void notrace raw_local_irq_restore(unsigned long flags) +void notrace arch_local_irq_restore(unsigned long flags) { unsigned long __dummy0, __dummy1; @@ -38,9 +38,9 @@ void notrace raw_local_irq_restore(unsigned long flags) ); } } -EXPORT_SYMBOL(raw_local_irq_restore); +EXPORT_SYMBOL(arch_local_irq_restore); -unsigned long notrace __raw_local_save_flags(void) +unsigned long notrace __arch_local_save_flags(void) { unsigned long flags; @@ -54,4 +54,4 @@ unsigned long notrace __raw_local_save_flags(void) return flags; } -EXPORT_SYMBOL(__raw_local_save_flags); +EXPORT_SYMBOL(__arch_local_save_flags);