From patchwork Mon Dec 15 08:48:07 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Borntraeger X-Patchwork-Id: 5491451 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 110D89F1CD for ; Mon, 15 Dec 2014 08:50:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4BF6B20A03 for ; Mon, 15 Dec 2014 08:50:49 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7779F20A01 for ; Mon, 15 Dec 2014 08:50:48 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Y0RKZ-0002TL-9M; Mon, 15 Dec 2014 08:48:39 +0000 Received: from e06smtp12.uk.ibm.com ([195.75.94.108]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Y0RKW-0002PZ-54 for linux-arm-kernel@lists.infradead.org; Mon, 15 Dec 2014 08:48:37 +0000 Received: from /spool/local by e06smtp12.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 15 Dec 2014 08:48:12 -0000 Received: from d06dlp02.portsmouth.uk.ibm.com (9.149.20.14) by e06smtp12.uk.ibm.com (192.168.101.142) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 15 Dec 2014 08:48:11 -0000 Received: from b06cxnps3075.portsmouth.uk.ibm.com (d06relay10.portsmouth.uk.ibm.com [9.149.109.195]) by d06dlp02.portsmouth.uk.ibm.com (Postfix) with ESMTP id 804022190045 for ; Mon, 15 Dec 2014 08:47:41 +0000 (GMT) Received: from d06av12.portsmouth.uk.ibm.com (d06av12.portsmouth.uk.ibm.com [9.149.37.247]) by b06cxnps3075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id sBF8mAL359244574 for ; Mon, 15 Dec 2014 08:48:10 GMT Received: from d06av12.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av12.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id sBF8m9Oa005897 for ; Mon, 15 Dec 2014 01:48:10 -0700 Received: from tuxmaker.boeblingen.de.ibm.com (tuxmaker.boeblingen.de.ibm.com [9.152.85.9]) by d06av12.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id sBF8m9O7005877; Mon, 15 Dec 2014 01:48:09 -0700 Received: by tuxmaker.boeblingen.de.ibm.com (Postfix, from userid 25651) id 4B3C41224439; Mon, 15 Dec 2014 09:48:09 +0100 (CET) From: Christian Borntraeger To: Russell King Subject: [PATCH] arm/rpc: avoid static keyword removal via define Date: Mon, 15 Dec 2014 09:48:07 +0100 Message-Id: <1418633287-5019-2-git-send-email-borntraeger@de.ibm.com> X-Mailer: git-send-email 1.8.5.5 In-Reply-To: <1418633287-5019-1-git-send-email-borntraeger@de.ibm.com> References: <1418633287-5019-1-git-send-email-borntraeger@de.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 14121508-0009-0000-0000-000002608C6F X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141215_004836_513014_004B155A X-CRM114-Status: GOOD ( 11.36 ) X-Spam-Score: -2.3 (--) Cc: Christian Borntraeger , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP commit 4486b86368d7 ("[ARM] riscpc: fix decompressor font file handling") introduced Makefile magic to avoid building a file two times. Using -Dstatic= does break some assumptions on compiler.h that were introduced for READ_ONCE. Lets just use sed on the copy instead of using a define. Signed-off-by: Christian Borntraeger Cc: Russell King --- arch/arm/boot/compressed/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile index 3ea230a..198f12a 100644 --- a/arch/arm/boot/compressed/Makefile +++ b/arch/arm/boot/compressed/Makefile @@ -196,10 +196,11 @@ $(obj)/piggy.$(suffix_y): $(obj)/../Image FORCE $(obj)/piggy.$(suffix_y).o: $(obj)/piggy.$(suffix_y) FORCE -CFLAGS_font.o := -Dstatic= - +# use the font from lib/fonts/. We have to make the font global, +# for the decompressor so lets remove the static declaration $(obj)/font.c: $(FONTC) $(call cmd,shipped) + sed -i s/static//g $@ $(obj)/hyp-stub.S: $(srctree)/arch/$(SRCARCH)/kernel/hyp-stub.S $(call cmd,shipped)