Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754610AbYGNWLX (ORCPT ); Mon, 14 Jul 2008 18:11:23 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753413AbYGNWLM (ORCPT ); Mon, 14 Jul 2008 18:11:12 -0400 Received: from agminet01.oracle.com ([141.146.126.228]:42142 "EHLO agminet01.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752531AbYGNWLL (ORCPT ); Mon, 14 Jul 2008 18:11:11 -0400 Date: Mon, 14 Jul 2008 15:07:31 -0700 From: Randy Dunlap To: Daniel Guilak Cc: linux-kernel@vger.kernel.org, trivial@kernel.org, akpm@linux-foundation.org, torvalds@linux-foundation.org, daniel@danielguilak.com Subject: Re: [PATCH] init/version.c: Define version_string only if CONFIG_KALLSYMS is not defined. Message-Id: <20080714150731.e86295b2.randy.dunlap@oracle.com> In-Reply-To: <1216070438.6497.27.camel@dguilak-desk> References: <1215552069.10304.6.camel@dguilak-desk> <1216062286.6497.18.camel@dguilak-desk> <20080714123858.2c42227f.randy.dunlap@oracle.com> <1216070438.6497.27.camel@dguilak-desk> Organization: Oracle Linux Eng. X-Mailer: Sylpheed 2.5.0 (GTK+ 2.12.0; x86_64-unknown-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Brightmail-Tracker: AAAAAQAAAAI= X-Brightmail-Tracker: AAAAAQAAAAI= X-Whitelist: TRUE X-Whitelist: TRUE Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2458 Lines: 67 On Mon, 14 Jul 2008 14:20:38 -0700 Daniel Guilak wrote: > On Mon, 2008-07-14 at 12:38 -0700, Randy Dunlap wrote: > > On Mon, 14 Jul 2008 12:04:46 -0700 Daniel Guilak wrote: > > > > > int Version_* is only used with ksymoops, which is only needed (according to > > > README and Documentation/Changes) if CONFIG_KALLSYMS is NOT defined. Therefore > > > this patch defines version_string only if CONFIG_KALLSYMS is not defined. > > > > > > Signed-off-by: Daniel Guilak > > > --- > > > init/version.c | 2 ++ > > > 1 files changed, 2 insertions(+), 0 deletions(-) > > > > > > Depends on "[PATCH] init/version.c: Silenced sparse warning by declaring the version string." > > > > > > diff --git a/init/version.c b/init/version.c > > > index 041fd82..52a8b98 100644 > > > --- a/init/version.c > > > +++ b/init/version.c > > > @@ -13,11 +13,13 @@ > > > #include > > > #include > > > > > > +#ifndef CONFIG_KALLSYMS > > > #define version(a) Version_ ## a > > > #define version_string(a) version(a) > > > > > > extern int version_string(LINUX_VERSION_CODE); > > > int version_string(LINUX_VERSION_CODE); > > > +#endif > > > > > > struct uts_namespace init_uts_ns = { > > > .kref = { > > > -- > > > > Does not apply cleanly to linux-2.6.26, linux-next-20080714, or Linus-git-head. > > > > Did you apply "[PATCH] init/version.c: Silenced sparse warning by > declaring the version string." beforehand? I just applied it on the most > recent tree and I didn't have any issues. Clearly I didn't apply that patch. I missed anything saying that this was patch 2/2 in a dependent series. > > and why do we ned both extern int version_string() > > and int version_string() ? > Because sparse was complaining that it wasn't prototyped or static. > There isn't a header file to put it in since it only exists to be a > kernel. so the extern makes it be published in the symbol table, whereas a static would keep it private. Is that correct? and the second line (int version_string(LINUX_VERSION_CODE)) actually defines it. --- ~Randy Linux Plumbers Conference, 17-19 September 2008, Portland, Oregon USA http://linuxplumbersconf.org/ -- 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/