Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751484AbaLPLQD (ORCPT ); Tue, 16 Dec 2014 06:16:03 -0500 Received: from e06smtp11.uk.ibm.com ([195.75.94.107]:52815 "EHLO e06smtp11.uk.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751213AbaLPLQB (ORCPT ); Tue, 16 Dec 2014 06:16:01 -0500 Message-ID: <5490146A.3000408@de.ibm.com> Date: Tue, 16 Dec 2014 12:15:54 +0100 From: Christian Borntraeger User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.3.0 MIME-Version: 1.0 To: Russell King CC: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-next@vger.kernel.org Subject: Re: [PATCH] arm/rpc: avoid static keyword removal via define References: <1418633287-5019-1-git-send-email-borntraeger@de.ibm.com> <1418633287-5019-2-git-send-email-borntraeger@de.ibm.com> In-Reply-To: <1418633287-5019-2-git-send-email-borntraeger@de.ibm.com> Content-Type: text/plain; charset=iso-8859-15 Content-Transfer-Encoding: 7bit X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 14121611-0005-0000-0000-000002798EE9 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Am 15.12.2014 um 09:48 schrieb Christian Borntraeger: > 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 This fixed the linux-next build http://kisskb.ellerman.id.au/kisskb/target/1508/ Unless anybody complains, I will send the pull request for the access_once tree tomorrow and I have this patch applied on top. Christian > --- > 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) > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/