uml: host_info tidying

Move the host_info string from util.c to um_arch.c, where it is
actually initialized and used.  Also document its lack of locking.

Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/arch/um/include/os.h b/arch/um/include/os.h
index 5c74da4104511e6faaa3821c01d3c4b7495ac730..22666b4a8be76b1988bc133eea9c2a9319d55cae 100644 (file)
--- a/arch/um/include/os.h
+++ b/arch/um/include/os.h
@@ -273,7 +273,7 @@ extern void stack_protections(unsigned long address);
 extern void task_protections(unsigned long address);
 extern int raw(int fd);
 extern void setup_machinename(char *machine_out);
-extern void setup_hostinfo(void);
+extern void setup_hostinfo(char *buf, int len);
 extern int setjmp_wrapper(void (*proc)(void *, void *), ...);
 
 /* time.c */

diff --git a/arch/um/include/user_util.h b/arch/um/include/user_util.h
index 99492d5c82dbbd0544c8880472e072685870070e..73ffea1829fc93344debc20617e5de1c93ccf713 100644 (file)
--- a/arch/um/include/user_util.h
+++ b/arch/um/include/user_util.h
@@ -36,8 +36,6 @@ extern unsigned long end_vm;
 extern unsigned long start_vm;
 extern unsigned long long highmem;
 
-extern char host_info[];
-
 extern unsigned long _stext, _etext, _sdata, _edata, __bss_start, _end;
 extern unsigned long _unprotected_end;
 extern unsigned long brk_start;

diff --git a/arch/um/kernel/um_arch.c b/arch/um/kernel/um_arch.c
index 299d75a41a7f2f49320c389bf9b363c772dc36fa..613fb082bbd5896ed8a14d391ff4243ae1f17362 100644 (file)
--- a/arch/um/kernel/um_arch.c
+++ b/arch/um/kernel/um_arch.c
@@ -17,6 +17,7 @@
 #include "linux/seq_file.h"
 #include "linux/delay.h"
 #include "linux/module.h"
+#include "linux/utsname.h"
 #include "asm/page.h"
 #include "asm/pgtable.h"
 #include "asm/ptrace.h"
@@ -67,6 +68,9 @@ unsigned long thread_saved_pc(struct task_struct *task)
                                              task));
 }
 
+/* Changed in setup_arch, which is called in early boot */
+static char host_info[(__NEW_UTS_LEN + 1) * 5];
+
 static int show_cpuinfo(struct seq_file *m, void *v)
 {
        int index = 0;
@@ -482,7 +486,7 @@ void __init setup_arch(char **cmdline_p)
        paging_init();
        strlcpy(boot_command_line, command_line, COMMAND_LINE_SIZE);
        *cmdline_p = command_line;
-       setup_hostinfo();
+       setup_hostinfo(host_info, sizeof host_info);
 }
 
 void __init check_bugs(void)

diff --git a/arch/um/os-Linux/util.c b/arch/um/os-Linux/util.c
index 56b8a50e8bc2e08c3bfa5b7661b954599f5c6cee..125854a2aa2228b77aba8fc28c92f5009e163391 100644 (file)
--- a/arch/um/os-Linux/util.c
+++ b/arch/um/os-Linux/util.c
@@ -96,15 +96,13 @@ void setup_machinename(char *machine_out)
        strcpy(machine_out, host.machine);
 }
 
-char host_info[(_UTSNAME_LENGTH + 1) * 4 + _UTSNAME_NODENAME_LENGTH + 1];
-
-void setup_hostinfo(void)
+void setup_hostinfo(char *buf, int len)
 {
        struct utsname host;
 
        uname(&host);
-       sprintf(host_info, "%s %s %s %s %s", host.sysname, host.nodename,
-               host.release, host.version, host.machine);
+       snprintf(buf, len, "%s %s %s %s %s", host.sysname, host.nodename,
+                host.release, host.version, host.machine);
 }
 
 int setjmp_wrapper(void (*proc)(void *, void *), ...)