From patchwork Fri Jun 10 18:21:06 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hartley Sweeten X-Patchwork-Id: 871252 Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p5BALm5r013888 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Sat, 11 Jun 2011 10:22:12 GMT Received: from canuck.infradead.org ([134.117.69.58]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QVLJq-0006NR-P0; Sat, 11 Jun 2011 10:21:30 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1QVLJq-00008F-Bm; Sat, 11 Jun 2011 10:21:30 +0000 Received: from mail209.messagelabs.com ([216.82.255.3]) by canuck.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QVLJn-00007u-7G for linux-arm-kernel@lists.infradead.org; Sat, 11 Jun 2011 10:21:28 +0000 X-VirusChecked: Checked X-Env-Sender: hartleys@visionengravers.com X-Msg-Ref: server-2.tower-209.messagelabs.com!1307730080!7574079!5 X-StarScan-Version: 6.2.17; banners=-,-,- X-Originating-IP: [216.166.12.31] Received: (qmail 21593 invoked from network); 10 Jun 2011 18:21:24 -0000 Received: from out001.collaborationhost.net (HELO out001.collaborationhost.net) (216.166.12.31) by server-2.tower-209.messagelabs.com with RC4-SHA encrypted SMTP; 10 Jun 2011 18:21:24 -0000 Received: from etch.local (10.2.3.210) by smtp.collaborationhost.net (10.2.0.46) with Microsoft SMTP Server (TLS) id 8.2.176.0; Fri, 10 Jun 2011 13:21:22 -0500 From: H Hartley Sweeten To: ARM Kernel Subject: [PATCH] ARM: bug.h: fix sparse error: symbol '__bug' redeclared Date: Fri, 10 Jun 2011 11:21:06 -0700 User-Agent: KMail/1.9.9 MIME-Version: 1.0 Content-Disposition: inline Message-ID: <201106101121.07197.hartleys@visionengravers.com> X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110611_062127_504164_642AF998 X-CRM114-Status: GOOD ( 10.59 ) X-Spam-Score: -1.1 (-) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (-1.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- 1.2 RCVD_IN_BL_SPAMCOP_NET RBL: Received via a relay in bl.spamcop.net [Blocked - see ] -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, medium trust [216.82.255.3 listed in list.dnswl.org] Cc: Russell King X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Sat, 11 Jun 2011 10:22:12 +0000 (UTC) The symbol '__bug' is declared in arch/arm/include/asm/bug.h as: extern void __bug(const char *file, int line) __attribute__((noreturn)); But is defined in arch/arm/kernel/traps.c as: void __attribute__((noreturn)) __bug(const char *file, int line) The different position of the __attribute_((noreturn)) causes a sparse error. Change the declaration to match the definition to quiet the error. Signed-off-by: H Hartley Sweeten Cc: Russell King diff --git a/arch/arm/include/asm/bug.h b/arch/arm/include/asm/bug.h index 4d88425..0e56435 100644 --- a/arch/arm/include/asm/bug.h +++ b/arch/arm/include/asm/bug.h @@ -4,7 +4,7 @@ #ifdef CONFIG_BUG #ifdef CONFIG_DEBUG_BUGVERBOSE -extern void __bug(const char *file, int line) __attribute__((noreturn)); +extern void __attribute__((noreturn)) __bug(const char *file, int line); /* give file/line information */ #define BUG() __bug(__FILE__, __LINE__)