Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ae52bb23 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Linus Torvalds
Browse files

fbdev: move logo externs to header file 



Now we have __initconst, we can finally move the external declarations for
the various Linux logo structures to <linux/linux_logo.h>.

James' ack dates back to the previous submission (way to long ago), when the
logos were still __initdata, which caused failures on some platforms with some
toolchain versions.

Signed-off-by: default avatarGeert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
Acked-by: default avatarJames Simmons <jsimmons@infradead.org>
Cc: Krzysztof Helt <krzysztof.h1@poczta.fm>
Cc: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a53c9d5b

arch/powerpc/kernel/prom_init.c

+0 −3
Original line number Diff line number Diff line
@@ -44,10 +44,7 @@ 
#include <asm/sections.h>

#include <asm/machdep.h>



#ifdef CONFIG_LOGO_LINUX_CLUT224

#include <linux/linux_logo.h>

extern const struct linux_logo logo_linux_clut224;

#endif



/*

 * Properties whose value is longer than this get excluded from our

arch/powerpc/platforms/cell/spu_base.c

+1 −10
Original line number Diff line number Diff line
@@ -752,17 +752,8 @@ static int __init init_spu_base(void) 
		goto out_unregister_sysdev_class;

	}



	if (ret > 0) {

		/*

		 * We cannot put the forward declaration in

		 * <linux/linux_logo.h> because of conflicting session type

		 * conflicts for const and __initdata with different compiler

		 * versions

		 */

		extern const struct linux_logo logo_spe_clut224;



	if (ret > 0)

		fb_append_extra_logo(&logo_spe_clut224, ret);

	}



	mutex_lock(&spu_full_list_mutex);

	xmon_register_spus(&spu_full_list);

arch/um/include/shared/init.h

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
 * sign followed by value, e.g.:

 *

 * static int init_variable __initdata = 0;

 * static char linux_logo[] __initdata = { 0x32, 0x36, ... };

 * static const char linux_logo[] __initconst = { 0x32, 0x36, ... };

 *

 * Don't forget to initialize data not at file scope, i.e. within a function,

 * as gcc otherwise puts the data into the bss section and not into the init

drivers/video/logo/logo.c

+0 −15
Original line number Diff line number Diff line
@@ -21,21 +21,6 @@ 
#include <asm/bootinfo.h>

#endif



extern const struct linux_logo logo_linux_mono;

extern const struct linux_logo logo_linux_vga16;

extern const struct linux_logo logo_linux_clut224;

extern const struct linux_logo logo_blackfin_vga16;

extern const struct linux_logo logo_blackfin_clut224;

extern const struct linux_logo logo_dec_clut224;

extern const struct linux_logo logo_mac_clut224;

extern const struct linux_logo logo_parisc_clut224;

extern const struct linux_logo logo_sgi_clut224;

extern const struct linux_logo logo_sun_clut224;

extern const struct linux_logo logo_superh_mono;

extern const struct linux_logo logo_superh_vga16;

extern const struct linux_logo logo_superh_clut224;

extern const struct linux_logo logo_m32r_clut224;



static int nologo;

module_param(nologo, bool, 0);

MODULE_PARM_DESC(nologo, "Disables startup logo");

include/linux/init.h

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
 * sign followed by value, e.g.:

 *

 * static int init_variable __initdata = 0;

 * static char linux_logo[] __initdata = { 0x32, 0x36, ... };

 * static const char linux_logo[] __initconst = { 0x32, 0x36, ... };

 *

 * Don't forget to initialize data not at file scope, i.e. within a function,

 * as gcc otherwise puts the data into the bss section and not into the init