Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932261AbXLMVa0 (ORCPT ); Thu, 13 Dec 2007 16:30:26 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754007AbXLMVaL (ORCPT ); Thu, 13 Dec 2007 16:30:11 -0500 Received: from nf-out-0910.google.com ([64.233.182.186]:41292 "EHLO nf-out-0910.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1762272AbXLMVaI (ORCPT ); Thu, 13 Dec 2007 16:30:08 -0500 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:references:mime-version:content-type:content-disposition:content-transfer-encoding:in-reply-to:user-agent; b=iGGuH2xWJYJXvA5c1+WIo2df0VxB/xJis3Gj3XXz03MohkRYFJgRFcF9u3kv/wiYmu7nD5H4KNFWrDvBZ1SAtEcXtU4QyJ3g+qsC8Ji4EUmObEZcXLJZY+LIMy5lRH4/qeskhe9Kht7rnFeSKLM6JVFr9rl3lZ833R0RdlKQjB4= Date: Thu, 13 Dec 2007 22:31:35 +0100 From: Marcin Slusarz To: Andrew Morton Cc: linux-kernel@vger.kernel.org, Antonino Daplas , linux-fbdev-devel@lists.sourceforge.net, Sam Ravnborg Subject: Re: [PATCH] logo: move declarations of logos to linux_logo.h Message-ID: <20071213213130.GA1822@joi> References: <20071209214027.GG9440@joi> <20071213023111.30ddc487.akpm@linux-foundation.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20071213023111.30ddc487.akpm@linux-foundation.org> User-Agent: Mutt/1.5.16 (2007-06-09) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 5626 Lines: 140 On Thu, Dec 13, 2007 at 02:31:11AM -0800, Andrew Morton wrote: > On Sun, 9 Dec 2007 22:40:31 +0100 Marcin Ślusarz wrote: > > > logo: move declarations of logos to linux_logo.h > > > > there was a mismatch between externs in logo.c and code generated by pnmtologo > > (on old tree, you need to rm drivers/video/logo/logo_*.c before compilation) > > This patch (after I fixed it) keeps on causing trouble: mismatches between > the header file declarations and the actual definitions of the lookup > tables. This happens as I apply and unapply the patch. > > It _shouldn't_ happen, but there would appear to be some missing makefile > rules. I guess the C files aren't being regenerated when > scripts/pnmtologo.c has been altered, so the C files aren't matching the > header which this patch alters. Ok, updated patch below: logo: move declarations of logos to linux_logo.h there was a mismatch between externs in logo.c and code generated by pnmtologo Signed-off-by: Marcin Slusarz CC: Antonino Daplas CC: Andrew Morton CC: Sam Ravnborg --- drivers/video/logo/Makefile | 8 ++++---- drivers/video/logo/logo.c | 13 ------------- include/linux/linux_logo.h | 13 +++++++++++++ scripts/pnmtologo.c | 6 +++--- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/drivers/video/logo/Makefile b/drivers/video/logo/Makefile index a5fc4ed..61b8c24 100644 --- a/drivers/video/logo/Makefile +++ b/drivers/video/logo/Makefile @@ -41,16 +41,16 @@ quiet_cmd_logo = LOGO $@ -t $(patsubst $*_%,%,$(notdir $(basename $<))) \ -n $(notdir $(basename $<)) -o $@ $< -$(obj)/%_mono.c: $(src)/%_mono.pbm FORCE +$(obj)/%_mono.c: $(src)/%_mono.pbm scripts/pnmtologo FORCE $(call if_changed,logo) -$(obj)/%_vga16.c: $(src)/%_vga16.ppm FORCE +$(obj)/%_vga16.c: $(src)/%_vga16.ppm scripts/pnmtologo FORCE $(call if_changed,logo) -$(obj)/%_clut224.c: $(src)/%_clut224.ppm FORCE +$(obj)/%_clut224.c: $(src)/%_clut224.ppm scripts/pnmtologo FORCE $(call if_changed,logo) -$(obj)/%_gray256.c: $(src)/%_gray256.pgm FORCE +$(obj)/%_gray256.c: $(src)/%_gray256.pgm scripts/pnmtologo FORCE $(call if_changed,logo) # Files generated that shall be removed upon make clean diff --git a/drivers/video/logo/logo.c b/drivers/video/logo/logo.c index fc72684..f5a0cd3 100644 --- a/drivers/video/logo/logo.c +++ b/drivers/video/logo/logo.c @@ -21,19 +21,6 @@ #include #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; - static int nologo; module_param(nologo, bool, 0); MODULE_PARM_DESC(nologo, "Disables startup logo"); diff --git a/include/linux/linux_logo.h b/include/linux/linux_logo.h index 08a9296..da9fb79 100644 --- a/include/linux/linux_logo.h +++ b/include/linux/linux_logo.h @@ -42,4 +42,17 @@ static inline void fb_append_extra_logo(const struct linux_logo *logo, {} #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; + #endif /* _LINUX_LINUX_LOGO_H */ diff --git a/scripts/pnmtologo.c b/scripts/pnmtologo.c index 6aa2a24..3048431 100644 --- a/scripts/pnmtologo.c +++ b/scripts/pnmtologo.c @@ -237,14 +237,14 @@ static void write_header(void) fprintf(out, " * Linux logo %s\n", logoname); fputs(" */\n\n", out); fputs("#include \n\n", out); - fprintf(out, "static unsigned char %s_data[] __initdata = {\n", + fprintf(out, "static const unsigned char %s_data[] __initdata = {\n", logoname); } static void write_footer(void) { fputs("\n};\n\n", out); - fprintf(out, "struct linux_logo %s __initdata = {\n", logoname); + fprintf(out, "const struct linux_logo %s __initdata = {\n", logoname); fprintf(out, " .type\t= %s,\n", logo_types[logo_type]); fprintf(out, " .width\t= %d,\n", logo_width); fprintf(out, " .height\t= %d,\n", logo_height); @@ -374,7 +374,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[] __initdata = {\n", logoname); write_hex_cnt = 0; for (i = 0; i < logo_clutsize; i++) { -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/