From: Christian Borntraeger <borntraeger@de•ibm.com>
To: Russell King <linux@arm•linux.org.uk>
Cc: linux-kernel@vger•kernel.org,
linux-arm-kernel@lists•infradead.org, linux-next@vger•kernel.org,
Christian Borntraeger <borntraeger@de•ibm.com>
Subject: [PATCH] arm/rpc: avoid static keyword removal via define
Date: Mon, 15 Dec 2014 09:48:07 +0100 [thread overview]
Message-ID: <1418633287-5019-2-git-send-email-borntraeger@de.ibm.com> (raw)
In-Reply-To: <1418633287-5019-1-git-send-email-borntraeger@de.ibm.com>
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 <borntraeger@de•ibm.com>
Cc: Russell King <linux@arm•linux.org.uk>
---
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
next prev parent reply other threads:[~2014-12-15 8:48 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-15 8:48 [PATCH 0/1] arm: Fix fallout from the access_once tree Christian Borntraeger
2014-12-15 8:48 ` Christian Borntraeger [this message]
2014-12-16 11:15 ` [PATCH] arm/rpc: avoid static keyword removal via define Christian Borntraeger
2014-12-16 11:40 ` Russell King - ARM Linux
2014-12-17 14:20 ` Christian Borntraeger
2014-12-17 15:29 ` Christian Borntraeger
2014-12-17 16:54 ` Russell King - ARM Linux
2014-12-17 19:45 ` Christian Borntraeger
2014-12-18 9:34 ` Christian Borntraeger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1418633287-5019-2-git-send-email-borntraeger@de.ibm.com \
--to=borntraeger@de$(echo .)ibm.com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=linux@arm$(echo .)linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox