diff options
| author | Jeff Dike <jdike@addtoit.com> | 2007-05-06 14:50:59 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-07 12:13:00 -0700 |
| commit | b4ffb6ad8d8477b561377ca150bbbfc0db02da54 (patch) | |
| tree | 1f10ef5f1b2afc3ea4e991f473f5e5bfe497f608 /arch/um/include | |
| parent | a5ed1ffa6c2480cdcf3f0aa945f0b8622fe4e90b (diff) | |
| download | blackbird-op-linux-b4ffb6ad8d8477b561377ca150bbbfc0db02da54.tar.gz blackbird-op-linux-b4ffb6ad8d8477b561377ca150bbbfc0db02da54.zip | |
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>
Diffstat (limited to 'arch/um/include')
| -rw-r--r-- | arch/um/include/os.h | 2 | ||||
| -rw-r--r-- | arch/um/include/user_util.h | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/arch/um/include/os.h b/arch/um/include/os.h index 5c74da410451..22666b4a8be7 100644 --- 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 99492d5c82db..73ffea1829fc 100644 --- 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; |
