aboutsummaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorHerbert Poetzl <herbert@13thfloor.at>2006-12-08 02:36:00 -0800
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-08 08:28:37 -0800
commita2ee8649ba6d71416712e798276bf7c40b64e6e5 (patch)
tree90603c28d717fc0b2e92adb7e3f3a98adf6ae458 /init
parent6e2ac66470976ad7f57e0948572669b2bdfea2d0 (diff)
downloadlinux-linaro-stable-a2ee8649ba6d71416712e798276bf7c40b64e6e5.tar.gz
[PATCH] Fix linux banner utsname information
utsname information is shown in the linux banner, which also is used for /proc/version (which can have different utsname values inside a uts namespaces). this patch makes the varying data arguments and changes the string to a format string, using those arguments. Signed-off-by: Herbert Poetzl <herbert@13thfloor.at> Cc: "Eric W. Biederman" <ebiederm@xmission.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'init')
-rw-r--r--init/Makefile1
-rw-r--r--init/main.c4
-rw-r--r--init/version.c5
3 files changed, 7 insertions, 3 deletions
diff --git a/init/Makefile b/init/Makefile
index 633a268d270d..d6c764d0eabb 100644
--- a/init/Makefile
+++ b/init/Makefile
@@ -15,6 +15,7 @@ clean-files := ../include/linux/compile.h
# dependencies on generated files need to be listed explicitly
+$(obj)/main.o: include/linux/compile.h
$(obj)/version.o: include/linux/compile.h
# compile.h changes depending on hostname, generation number, etc,
diff --git a/init/main.c b/init/main.c
index 1174ae3aec8c..4cdcd06e6d78 100644
--- a/init/main.c
+++ b/init/main.c
@@ -50,6 +50,8 @@
#include <linux/buffer_head.h>
#include <linux/debug_locks.h>
#include <linux/lockdep.h>
+#include <linux/utsrelease.h>
+#include <linux/compile.h>
#include <asm/io.h>
#include <asm/bugs.h>
@@ -506,7 +508,7 @@ asmlinkage void __init start_kernel(void)
boot_cpu_init();
page_address_init();
printk(KERN_NOTICE);
- printk(linux_banner);
+ printk(linux_banner, UTS_RELEASE, UTS_VERSION);
setup_arch(&command_line);
unwind_setup();
setup_per_cpu_areas();
diff --git a/init/version.c b/init/version.c
index 8f28344d9c70..2a5dfcd1c2e6 100644
--- a/init/version.c
+++ b/init/version.c
@@ -35,5 +35,6 @@ struct uts_namespace init_uts_ns = {
EXPORT_SYMBOL_GPL(init_uts_ns);
const char linux_banner[] =
- "Linux version " UTS_RELEASE " (" LINUX_COMPILE_BY "@"
- LINUX_COMPILE_HOST ") (" LINUX_COMPILER ") " UTS_VERSION "\n";
+ "Linux version %s (" LINUX_COMPILE_BY "@"
+ LINUX_COMPILE_HOST ") (" LINUX_COMPILER ") %s\n";
+