Commit 8b468976 authored by Anton Blanchard's avatar Anton Blanchard Committed by Linus Torvalds

[PATCH] __initdata must not be marked const

Fix up a few places where we marked __initdata as being const.

This causes a section conflict (init section vs .rodata)
parent e5643ec8
...@@ -236,14 +236,14 @@ static void write_header(void) ...@@ -236,14 +236,14 @@ static void write_header(void)
fprintf(out, " * Linux logo %s\n", logoname); fprintf(out, " * Linux logo %s\n", logoname);
fputs(" */\n\n", out); fputs(" */\n\n", out);
fputs("#include <linux/linux_logo.h>\n\n", out); fputs("#include <linux/linux_logo.h>\n\n", out);
fprintf(out, "static const unsigned char %s_data[] __initdata = {\n", fprintf(out, "static unsigned char %s_data[] __initdata = {\n",
logoname); logoname);
} }
static void write_footer(void) static void write_footer(void)
{ {
fputs("\n};\n\n", out); fputs("\n};\n\n", out);
fprintf(out, "const struct linux_logo %s __initdata = {\n", logoname); fprintf(out, "struct linux_logo %s __initdata = {\n", logoname);
fprintf(out, " .type\t= %s,\n", logo_types[logo_type]); fprintf(out, " .type\t= %s,\n", logo_types[logo_type]);
fprintf(out, " .width\t= %d,\n", logo_width); fprintf(out, " .width\t= %d,\n", logo_width);
fprintf(out, " .height\t= %d,\n", logo_height); fprintf(out, " .height\t= %d,\n", logo_height);
...@@ -373,7 +373,7 @@ static void write_logo_clut224(void) ...@@ -373,7 +373,7 @@ static void write_logo_clut224(void)
fputs("\n};\n\n", out); fputs("\n};\n\n", out);
/* write logo clut */ /* write logo clut */
fprintf(out, "static const unsigned char %s_clut[] __initdata = {\n", fprintf(out, "static unsigned char %s_clut[] __initdata = {\n",
logoname); logoname);
write_hex_cnt = 0; write_hex_cnt = 0;
for (i = 0; i < logo_clutsize; i++) { for (i = 0; i < logo_clutsize; i++) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment