]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
video/logo: Make logo data const again
authorGeert Uytterhoeven <geert+renesas@glider.be>
Wed, 12 Jun 2024 13:41:17 +0000 (15:41 +0200)
committerHelge Deller <deller@gmx.de>
Thu, 13 Jun 2024 21:05:26 +0000 (23:05 +0200)
As gcc-4.1 is no longer supported, the logo data can be made const
again.  Hence revert commit 15e3252464432a29 ("fbdev: work around old
compiler bug").

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Helge Deller <deller@gmx.de>
drivers/video/logo/pnmtologo.c

index 8080c4d9c4a23fbb6008a6aaef05d84f15bcaf49..28d9f0b907a99a058b9c7d5fadb4f59b227a0128 100644 (file)
@@ -238,7 +238,7 @@ static void write_header(void)
        fprintf(out, " *  Linux logo %s\n", logoname);
        fputs(" */\n\n", out);
        fputs("#include <linux/linux_logo.h>\n\n", out);
-       fprintf(out, "static unsigned char %s_data[] __initdata = {\n",
+       fprintf(out, "static const unsigned char %s_data[] __initconst = {\n",
                logoname);
 }
 
@@ -375,7 +375,7 @@ static void write_logo_clut224(void)
        fputs("\n};\n\n", out);
 
        /* write logo clut */
-       fprintf(out, "static unsigned char %s_clut[] __initdata = {\n",
+       fprintf(out, "static const unsigned char %s_clut[] __initconst = {\n",
                logoname);
        write_hex_cnt = 0;
        for (i = 0; i < logo_clutsize; i++) {