WSL2-Linux-Kernel/lib/fonts
Lee Jones 9522750c66 Fonts: Replace discarded const qualifier
Commit 6735b4632d ("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.  Do the same for the
other 12 built-in fonts as well, for consistency purposes.

Cc: <stable@vger.kernel.org>
Cc: Russell King <linux@armlinux.org.uk>
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Fixes: 6735b4632d ("Fonts: Support FONT_EXTRA_WORDS macros for built-in fonts")
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Co-developed-by: Peilin Ye <yepeilin.cs@gmail.com>
Signed-off-by: Peilin Ye <yepeilin.cs@gmail.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20201102183242.2031659-1-yepeilin.cs@gmail.com
2020-11-03 10:51:34 +01:00
..
Kconfig lib/fonts: add font 6x8 for OLED display 2020-09-08 13:33:21 +02:00
Makefile lib/fonts: add font 6x8 for OLED display 2020-09-08 13:33:21 +02:00
font_6x8.c Fonts: Replace discarded const qualifier 2020-11-03 10:51:34 +01:00
font_6x10.c Fonts: Replace discarded const qualifier 2020-11-03 10:51:34 +01:00
font_6x11.c Fonts: Replace discarded const qualifier 2020-11-03 10:51:34 +01:00
font_7x14.c Fonts: Replace discarded const qualifier 2020-11-03 10:51:34 +01:00
font_8x8.c Fonts: Replace discarded const qualifier 2020-11-03 10:51:34 +01:00
font_8x16.c Fonts: Replace discarded const qualifier 2020-11-03 10:51:34 +01:00
font_10x18.c Fonts: Replace discarded const qualifier 2020-11-03 10:51:34 +01:00
font_acorn_8x8.c Fonts: Replace discarded const qualifier 2020-11-03 10:51:34 +01:00
font_mini_4x6.c Fonts: Replace discarded const qualifier 2020-11-03 10:51:34 +01:00
font_pearl_8x8.c Fonts: Replace discarded const qualifier 2020-11-03 10:51:34 +01:00
font_sun8x16.c Fonts: Replace discarded const qualifier 2020-11-03 10:51:34 +01:00
font_sun12x22.c Fonts: Replace discarded const qualifier 2020-11-03 10:51:34 +01:00
font_ter16x32.c Fonts: Replace discarded const qualifier 2020-11-03 10:51:34 +01:00
fonts.c lib/fonts: add font 6x8 for OLED display 2020-09-08 13:33:21 +02:00