diff options
author | Roman Zippel <zippel@linux-m68k.org> | 2007-01-10 08:45:28 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2007-01-10 12:33:59 -0500 |
commit | 3eb3c740f51c2126b53c2dde974c1c57e634aa7b (patch) | |
tree | bbc9a1152685d8ed97f231e4ff161d01d58f0fe2 /fs/proc | |
parent | 8edf51a5ee38eb40de5449e131fd36450a229430 (diff) |
[PATCH] fix linux banner format string
Revert previous attempts at messing with the linux banner string and
simply use a separate format string for proc.
Signed-off-by: Roman Zippel <zippel@linux-m68k.org>
Acked-by: Olaf Hering <olaf@aepfle.de>
Acked-by: Jean Delvare <khali@linux-fr.org>
Cc: Andrey Borzenkov <arvidjaar@mail.ru>
Cc: Andrew Morton <akpm@osdl.org>
Cc: Andy Whitcroft <apw@shadowen.org>
Cc: Herbert Poetzl <herbert@13thfloor.at>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'fs/proc')
-rw-r--r-- | fs/proc/proc_misc.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/fs/proc/proc_misc.c b/fs/proc/proc_misc.c index 92ea7743fe8f..b37ce33f67ea 100644 --- a/fs/proc/proc_misc.c +++ b/fs/proc/proc_misc.c | |||
@@ -47,7 +47,6 @@ | |||
47 | #include <linux/vmalloc.h> | 47 | #include <linux/vmalloc.h> |
48 | #include <linux/crash_dump.h> | 48 | #include <linux/crash_dump.h> |
49 | #include <linux/pid_namespace.h> | 49 | #include <linux/pid_namespace.h> |
50 | #include <linux/compile.h> | ||
51 | #include <asm/uaccess.h> | 50 | #include <asm/uaccess.h> |
52 | #include <asm/pgtable.h> | 51 | #include <asm/pgtable.h> |
53 | #include <asm/io.h> | 52 | #include <asm/io.h> |
@@ -254,12 +253,7 @@ static int version_read_proc(char *page, char **start, off_t off, | |||
254 | { | 253 | { |
255 | int len; | 254 | int len; |
256 | 255 | ||
257 | /* FIXED STRING! Don't touch! */ | 256 | len = snprintf(page, PAGE_SIZE, linux_proc_banner, |
258 | len = snprintf(page, PAGE_SIZE, | ||
259 | "%s version %s" | ||
260 | " (" LINUX_COMPILE_BY "@" LINUX_COMPILE_HOST ")" | ||
261 | " (" LINUX_COMPILER ")" | ||
262 | " %s\n", | ||
263 | utsname()->sysname, | 257 | utsname()->sysname, |
264 | utsname()->release, | 258 | utsname()->release, |
265 | utsname()->version); | 259 | utsname()->version); |