Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751722AbaLOIsb (ORCPT ); Mon, 15 Dec 2014 03:48:31 -0500 Received: from e06smtp12.uk.ibm.com ([195.75.94.108]:33577 "EHLO e06smtp12.uk.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751211AbaLOIsQ (ORCPT ); Mon, 15 Dec 2014 03:48:16 -0500 From: Christian Borntraeger To: Russell King Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-next@vger.kernel.org, Christian Borntraeger 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-000002608C70 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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) -- 1.8.5.5 -- 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/