From: Lee Jones <lee.jones@linaro.org>
To: daniel.vetter@ffwll.ch, gregkh@linuxfoundation.org,
yepeilin.cs@gmail.com
Cc: linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, Lee Jones <lee.jones@linaro.org>,
stable@vger.kernel.org, Russell King <linux@armlinux.org.uk>
Subject: [PATCH 1/1] Fonts: font_acorn_8x8: Replace discarded const qualifier
Date: Fri, 30 Oct 2020 18:18:22 +0000 [thread overview]
Message-ID: <20201030181822.570402-1-lee.jones@linaro.org> (raw)
Commit 09e5b3fd5672 ("Fonts: Support FONT_EXTRA_WORDS macros for
built-in fonts") introduced the following error when building
rpc_defconfig (only this build appears to be affected):
`acorndata_8x8' referenced in section `.text' of arch/arm/boot/compressed/ll_char_wr.o:
defined in discarded section `.data' of arch/arm/boot/compressed/font.o
`acorndata_8x8' referenced in section `.data.rel.ro' of arch/arm/boot/compressed/font.o:
defined in discarded section `.data' of arch/arm/boot/compressed/font.o
make[3]: *** [/scratch/linux/arch/arm/boot/compressed/Makefile:191: arch/arm/boot/compressed/vmlinux] Error 1
make[2]: *** [/scratch/linux/arch/arm/boot/Makefile:61: arch/arm/boot/compressed/vmlinux] Error 2
make[1]: *** [/scratch/linux/arch/arm/Makefile:317: zImage] Error 2
The .data section is discarded at link time. Reinstating
acorndata_8x8 as const ensures it is still available after linking.
Cc: <stable@vger.kernel.org>
Cc: Russell King <linux@armlinux.org.uk>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
lib/fonts/font_acorn_8x8.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/fonts/font_acorn_8x8.c b/lib/fonts/font_acorn_8x8.c
index 069b3e80c4344..fb395f0d40317 100644
--- a/lib/fonts/font_acorn_8x8.c
+++ b/lib/fonts/font_acorn_8x8.c
@@ -5,7 +5,7 @@
#define FONTDATAMAX 2048
-static struct font_data acorndata_8x8 = {
+static const struct font_data acorndata_8x8 = {
{ 0, 0, FONTDATAMAX, 0 }, {
/* 00 */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* ^@ */
/* 01 */ 0x7e, 0x81, 0xa5, 0x81, 0xbd, 0x99, 0x81, 0x7e, /* ^A */
--
2.25.1
next reply other threads:[~2020-10-30 18:18 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-30 18:18 Lee Jones [this message]
2020-10-31 5:09 ` [PATCH 1/1] Fonts: font_acorn_8x8: Replace discarded const qualifier Peilin Ye
2020-10-31 10:27 ` Russell King - ARM Linux admin
2020-11-01 13:11 ` Lee Jones
2020-11-02 10:23 ` Russell King - ARM Linux admin
2020-11-02 10:30 ` Russell King - ARM Linux admin
2020-11-02 16:12 ` Peilin Ye
2020-11-02 10:56 ` Daniel Vetter
2020-11-02 11:09 ` Lee Jones
2020-11-02 11:18 ` Daniel Vetter
2020-11-02 11:30 ` Lee Jones
2020-11-02 14:50 ` Daniel Vetter
2020-11-02 16:17 ` Peilin Ye
2020-11-02 16:24 ` Lee Jones
2020-11-02 16:25 ` Lee Jones
2020-11-02 16:34 ` Peilin Ye
2020-11-02 18:32 ` [PATCH v2 1/1] Fonts: " Peilin Ye
2020-11-03 8:53 ` Lee Jones
2020-11-03 8:58 ` Daniel Vetter
2020-11-03 9:15 ` Greg KH
2020-11-03 9:52 ` Daniel Vetter
2020-11-03 10:55 ` Lee Jones
2020-11-03 11:42 ` Peilin Ye
2020-11-07 5:19 ` Peilin Ye
2020-11-07 15:36 ` Greg KH
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=20201030181822.570402-1-lee.jones@linaro.org \
--to=lee.jones@linaro.org \
--cc=daniel.vetter@ffwll.ch \
--cc=gregkh@linuxfoundation.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=stable@vger.kernel.org \
--cc=yepeilin.cs@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).