Commit 15e32524 authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Linus Torvalds
Browse files

fbdev: work around old compiler bug

When building with a 4.1.x compiler on powerpc64 (at least) we get this

drivers/video/logo/logo_linux_mono.c:81: error: logo_linux_mono causes a section type conflict

This was introduced by commit ae52bb23

("fbdev: move logo externs to header file").  This is a partial revert of
that commit sufficient to not hit the compiler bug.

Also convert _clut arrays from __initconst to __initdata.

Sam said:

  Al analysed this some time ago.  When we say something is const then
  _sometimes_ gcc annotate the section as const(?) - sometimes not.  So if
  we have two variables/functions annotated __*const and gcc decides to
  annotate the section const only in one case we get a section type
Signed-off-by: default avatarStephen Rothwell <>
Cc: Sam Ravnborg <>
Cc: Krzysztof Helt <>
Cc: Geert Uytterhoeven <>
Cc: Kyle McMartin <>
Cc: Al Viro <>
Signed-off-by: default avatarAndrew Morton <>
Signed-off-by: default avatarLinus Torvalds <>
parent c15e504b
......@@ -237,7 +237,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 const unsigned char %s_data[] __initconst = {\n",
fprintf(out, "static unsigned char %s_data[] __initdata = {\n",
......@@ -374,7 +374,7 @@ static void write_logo_clut224(void)
fputs("\n};\n\n", out);
/* write logo clut */
fprintf(out, "static const unsigned char %s_clut[] __initconst = {\n",
fprintf(out, "static unsigned char %s_clut[] __initdata = {\n",
write_hex_cnt = 0;
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