From: Daniel Guilak <guilak@linux.vnet.ibm.com>
Date: Fri, 25 Jul 2008 08:45:50 +0000 (-0700)
Subject: init/version.c: define version_string only if CONFIG_KALLSYMS is not defined
X-Git-Tag: v2.6.27-rc1~468
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=197dcffc8ba0ea943fee86e28e99cd9575799772;p=linux-2.6-omap-h63xx.git

init/version.c: define version_string only if CONFIG_KALLSYMS is not defined

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 <daniel@danielguilak.com>
Cc: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/init/version.c b/init/version.c
index 041fd822ce2..52a8b98642b 100644
--- a/init/version.c
+++ b/init/version.c
@@ -13,11 +13,13 @@
 #include <linux/utsrelease.h>
 #include <linux/version.h>
 
+#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 = {