summaryrefslogtreecommitdiffstats
path: root/init/main.c
diff options
context:
space:
mode:
authorHerbert Poetzl <herbert@13thfloor.at>2006-12-08 11:36:00 +0100
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-08 17:28:37 +0100
commita2ee8649ba6d71416712e798276bf7c40b64e6e5 (patch)
tree90603c28d717fc0b2e92adb7e3f3a98adf6ae458 /init/main.c
parent[PATCH] CPEI gets warning at kernel/irq/migration.c:27/move_masked_irq() (diff)
downloadlinux-a2ee8649ba6d71416712e798276bf7c40b64e6e5.tar.xz
linux-a2ee8649ba6d71416712e798276bf7c40b64e6e5.zip
[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/main.c')
-rw-r--r--init/main.c4
1 files changed, 3 insertions, 1 deletions
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();