From 8f88b93e27f0fcff2decf45be309cfd5029ba7bc Mon Sep 17 00:00:00 2001
From: Herbert Poetzl <herbert@13thfloor.at>
Date: Fri, 8 Dec 2006 02:36:00 -0800
Subject: [PATCH] --- yaml --- r: 43489 b: refs/heads/master c:
 a2ee8649ba6d71416712e798276bf7c40b64e6e5 h: refs/heads/master i:   43487:
 449134bb85dfd763f8074fc183e122edb340b011 v: v3

---
 [refs]                    | 2 +-
 trunk/fs/proc/proc_misc.c | 4 ++--
 trunk/init/Makefile       | 1 +
 trunk/init/main.c         | 4 +++-
 trunk/init/version.c      | 5 +++--
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 025e67e3552d..ee1d5eb5ac50 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6e2ac66470976ad7f57e0948572669b2bdfea2d0
+refs/heads/master: a2ee8649ba6d71416712e798276bf7c40b64e6e5
diff --git a/trunk/fs/proc/proc_misc.c b/trunk/fs/proc/proc_misc.c
index 51815cece6f3..9397ff62553e 100644
--- a/trunk/fs/proc/proc_misc.c
+++ b/trunk/fs/proc/proc_misc.c
@@ -252,8 +252,8 @@ static int version_read_proc(char *page, char **start, off_t off,
 {
 	int len;
 
-	strcpy(page, linux_banner);
-	len = strlen(page);
+	len = sprintf(page, linux_banner,
+		utsname()->release, utsname()->version);
 	return proc_calc_metrics(page, start, off, count, eof, len);
 }
 
diff --git a/trunk/init/Makefile b/trunk/init/Makefile
index 633a268d270d..d6c764d0eabb 100644
--- a/trunk/init/Makefile
+++ b/trunk/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/trunk/init/main.c b/trunk/init/main.c
index 1174ae3aec8c..4cdcd06e6d78 100644
--- a/trunk/init/main.c
+++ b/trunk/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/trunk/init/version.c b/trunk/init/version.c
index 8f28344d9c70..2a5dfcd1c2e6 100644
--- a/trunk/init/version.c
+++ b/trunk/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";
+