diff options
author | Herbert Poetzl <herbert@13thfloor.at> | 2006-12-08 05:36:00 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-08 11:28:37 -0500 |
commit | a2ee8649ba6d71416712e798276bf7c40b64e6e5 (patch) | |
tree | 90603c28d717fc0b2e92adb7e3f3a98adf6ae458 /init/main.c | |
parent | 6e2ac66470976ad7f57e0948572669b2bdfea2d0 (diff) |
[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.c | 4 |
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 @@ | |||
50 | #include <linux/buffer_head.h> | 50 | #include <linux/buffer_head.h> |
51 | #include <linux/debug_locks.h> | 51 | #include <linux/debug_locks.h> |
52 | #include <linux/lockdep.h> | 52 | #include <linux/lockdep.h> |
53 | #include <linux/utsrelease.h> | ||
54 | #include <linux/compile.h> | ||
53 | 55 | ||
54 | #include <asm/io.h> | 56 | #include <asm/io.h> |
55 | #include <asm/bugs.h> | 57 | #include <asm/bugs.h> |
@@ -506,7 +508,7 @@ asmlinkage void __init start_kernel(void) | |||
506 | boot_cpu_init(); | 508 | boot_cpu_init(); |
507 | page_address_init(); | 509 | page_address_init(); |
508 | printk(KERN_NOTICE); | 510 | printk(KERN_NOTICE); |
509 | printk(linux_banner); | 511 | printk(linux_banner, UTS_RELEASE, UTS_VERSION); |
510 | setup_arch(&command_line); | 512 | setup_arch(&command_line); |
511 | unwind_setup(); | 513 | unwind_setup(); |
512 | setup_per_cpu_areas(); | 514 | setup_per_cpu_areas(); |