LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
To: Linux Frame Buffer Device Development 
	<linux-fbdev-devel@lists.sourceforge.net>
Cc: James Simmons <jsimmons@infradead.org>,
	Cell Broadband Engine OSS Development  <cbe-oss-dev@ozlabs.org>,
	Linux Kernel Development <linux-kernel@vger.kernel.org>
Subject: const and __initdata (was: Re: [Linux-fbdev-devel] [PATCH 4/7] fbdev: move logo externs to header file)
Date: Tue, 13 Mar 2007 15:00:29 +0100 (CET)	[thread overview]
Message-ID: <Pine.LNX.4.62.0703131455160.27486@pademelon.sonytel.be> (raw)
In-Reply-To: <Pine.LNX.4.62.0701311339110.15066@pademelon.sonytel.be>

On Wed, 31 Jan 2007, Geert Uytterhoeven wrote:
> Move the external declarations for the various linux logo structures to
> <linux/linux_logo.h>. As a consequence, I had to remove the `const', as `const'
> is incompatible with `__initdata'.
> 
> Signed-off-by: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com>
> ---
>  arch/powerpc/kernel/prom_init.c |    3 ---
>  drivers/video/logo/logo.c       |   13 -------------
>  include/linux/linux_logo.h      |   13 +++++++++++++
>  3 files changed, 13 insertions(+), 16 deletions(-)
> 
> --- ps3-linux-2.6.20-rc7.orig/arch/powerpc/kernel/prom_init.c
> +++ ps3-linux-2.6.20-rc7/arch/powerpc/kernel/prom_init.c
> @@ -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
> --- ps3-linux-2.6.20-rc7.orig/drivers/video/logo/logo.c
> +++ ps3-linux-2.6.20-rc7/drivers/video/logo/logo.c
> @@ -21,19 +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_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;
> -
>  
>  const struct linux_logo *fb_find_logo(int depth)
>  {
> --- ps3-linux-2.6.20-rc7.orig/include/linux/linux_logo.h
> +++ ps3-linux-2.6.20-rc7/include/linux/linux_logo.h
> @@ -32,6 +32,19 @@ struct linux_logo {
>  	const unsigned char *data;
>  };
>  
> +extern struct linux_logo logo_linux_mono;
> +extern struct linux_logo logo_linux_vga16;
> +extern struct linux_logo logo_linux_clut224;
> +extern struct linux_logo logo_dec_clut224;
> +extern struct linux_logo logo_mac_clut224;
> +extern struct linux_logo logo_parisc_clut224;
> +extern struct linux_logo logo_sgi_clut224;
> +extern struct linux_logo logo_sun_clut224;
> +extern struct linux_logo logo_superh_mono;
> +extern struct linux_logo logo_superh_vga16;
> +extern struct linux_logo logo_superh_clut224;
> +extern struct linux_logo logo_m32r_clut224;
> +
>  extern const struct linux_logo *fb_find_logo(int depth);
>  
>  #endif /* _LINUX_LINUX_LOGO_H */

By modifying scripts/pnmtologo.c to add `const' to the declaration of the
linux_logo structs, I could keep the const.

However, this introduced a new conflict w.r.t. to `const' and `__initdata':
  - gcc 3.4.6 20060404 (Red Hat 3.4.6-3) for ia32 needs xxx_data[] and
    xxx_clut[] to be const too, else it complains about a section type conflict
  - ppu-gcc 4.1.0 20060304 (Red Hat 4.1.0-3) for ppc64 needs xxx_data[] and
    xxx_clut[] to be non-const, else it complains about a section type conflict

Anyone with a suggestion how to fix this? Keep everything non-const for now?
Add tests for specific compiler versions (I assume this is a gcc 3.x vs. 4.x
issue?)?

Thanks in advance!

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- Sony Network and Software Technology Center Europe (NSCE)
Geert.Uytterhoeven@sonycom.com ------- The Corporate Village, Da Vincilaan 7-D1
Voice +32-2-7008453 Fax +32-2-7008622 ---------------- B-1935 Zaventem, Belgium

  reply	other threads:[~2007-03-13 14:00 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-01-31 12:27 [PATCH 0/7] RFC: Cell SPE logos Geert Uytterhoeven
2007-01-31 12:40 ` Geert Uytterhoeven
2007-01-31 12:43 ` [PATCH 1/7] fbdev: Avoid vertical overflow when making space for the logo Geert Uytterhoeven
2007-01-31 12:43 ` [PATCH 2/7] fbdev: fb_do_show_logo() updates Geert Uytterhoeven
2007-01-31 12:44 ` [PATCH 3/7] fbdev: extract fb_show_logo_line() Geert Uytterhoeven
2007-01-31 12:44 ` [PATCH 4/7] fbdev: move logo externs to header file Geert Uytterhoeven
2007-03-13 14:00   ` Geert Uytterhoeven [this message]
2007-01-31 12:44 ` [PATCH 5/7] fbdev: Add fb_append_extra_logo() Geert Uytterhoeven
2007-01-31 12:44 ` [PATCH 6/7] fbdev: SPE helper penguin logo Geert Uytterhoeven
2007-01-31 12:44 ` [PATCH 7/7] Cell: Draw SPE helper penguin logos Geert Uytterhoeven
2007-02-01 16:51 ` [Cbe-oss-dev] [PATCH 0/7] RFC: Cell SPE logos Geoff Levand
2007-02-04 13:32 ` Pavel Machek
2007-02-04 17:44   ` [Linux-fbdev-devel] " Geert Uytterhoeven
2007-02-05  2:14   ` [Cbe-oss-dev] " Benjamin Herrenschmidt
2007-02-06 21:42     ` [Linux-fbdev-devel] " James Simmons
2007-02-07 12:44     ` Pavel Machek
2007-02-06 22:06 ` James Simmons
2007-02-12 13:54 ` Geert Uytterhoeven
2007-02-13 20:51   ` James Simmons
2007-02-14 17:33     ` Geert Uytterhoeven

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=Pine.LNX.4.62.0703131455160.27486@pademelon.sonytel.be \
    --to=geert.uytterhoeven@sonycom.com \
    --cc=cbe-oss-dev@ozlabs.org \
    --cc=jsimmons@infradead.org \
    --cc=linux-fbdev-devel@lists.sourceforge.net \
    --cc=linux-kernel@vger.kernel.org \
    --subject='const and __initdata (was: Re: [Linux-fbdev-devel] [PATCH 4/7] fbdev: move logo externs to header file)' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).