summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Guilak <guilak@linux.vnet.ibm.com>2008-07-25 01:45:50 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-25 10:53:29 -0700
commit197dcffc8ba0ea943fee86e28e99cd9575799772 (patch)
treec16027ddd94da37e0af991908639912ee174d65c
parent277e2c695907a70b316a31769cd891dc4d43b7f3 (diff)
downloadlinux-3.10-197dcffc8ba0ea943fee86e28e99cd9575799772.tar.gz
linux-3.10-197dcffc8ba0ea943fee86e28e99cd9575799772.tar.bz2
linux-3.10-197dcffc8ba0ea943fee86e28e99cd9575799772.zip
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>
-rw-r--r--init/version.c2
1 files changed, 2 insertions, 0 deletions
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 = {