From 2bb67e8e0a5aa9cb4221d845bdca94911ee1094a Mon Sep 17 00:00:00 2001 From: Jeff Dike Date: Fri, 6 May 2005 21:30:45 -0700 Subject: [PATCH] --- yaml --- r: 1076 b: refs/heads/master c: 16c11163019879c0e1e69d3ec7d4574a80e9c77e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/um/include/user_util.h | 1 - trunk/arch/um/kernel/um_arch.c | 7 ++++--- trunk/include/asm-um/setup.h | 3 ++- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 96f9dd80c0ea..8c9236e9f342 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8bef3e0a06c00bd44760361f84b08e30cd1bff0e +refs/heads/master: 16c11163019879c0e1e69d3ec7d4574a80e9c77e diff --git a/trunk/arch/um/include/user_util.h b/trunk/arch/um/include/user_util.h index 103cd320386c..b8c5b8a95250 100644 --- a/trunk/arch/um/include/user_util.h +++ b/trunk/arch/um/include/user_util.h @@ -67,7 +67,6 @@ extern void *um_kmalloc(int size); extern int switcheroo(int fd, int prot, void *from, void *to, int size); extern void setup_machinename(char *machine_out); extern void setup_hostinfo(void); -extern void add_arg(char *arg); extern void init_new_thread_stack(void *sig_stack, void (*usr1_handler)(int)); extern void init_new_thread_signals(int altstack); extern void do_exec(int old_pid, int new_pid); diff --git a/trunk/arch/um/kernel/um_arch.c b/trunk/arch/um/kernel/um_arch.c index 5c49d88eed3d..4d10ec372a67 100644 --- a/trunk/arch/um/kernel/um_arch.c +++ b/trunk/arch/um/kernel/um_arch.c @@ -23,6 +23,7 @@ #include "asm/ptrace.h" #include "asm/elf.h" #include "asm/user.h" +#include "asm/setup.h" #include "ubd_user.h" #include "asm/current.h" #include "asm/setup.h" @@ -42,9 +43,9 @@ #define DEFAULT_COMMAND_LINE "root=98:0" /* Changed in linux_main and setup_arch, which run before SMP is started */ -char command_line[COMMAND_LINE_SIZE] = { 0 }; +static char command_line[COMMAND_LINE_SIZE] = { 0 }; -void add_arg(char *arg) +static void add_arg(char *arg) { if (strlen(command_line) + strlen(arg) + 1 > COMMAND_LINE_SIZE) { printf("add_arg: Too many command line arguments!\n"); @@ -449,7 +450,7 @@ void __init setup_arch(char **cmdline_p) { notifier_chain_register(&panic_notifier_list, &panic_exit_notifier); paging_init(); - strlcpy(saved_command_line, command_line, COMMAND_LINE_SIZE); + strlcpy(saved_command_line, command_line, COMMAND_LINE_SIZE); *cmdline_p = command_line; setup_hostinfo(); } diff --git a/trunk/include/asm-um/setup.h b/trunk/include/asm-um/setup.h index c85252e803c1..99f086301f4c 100644 --- a/trunk/include/asm-um/setup.h +++ b/trunk/include/asm-um/setup.h @@ -2,7 +2,8 @@ #define SETUP_H_INCLUDED /* POSIX mandated with _POSIX_ARG_MAX that we can rely on 4096 chars in the - * command line, so this choice is ok.*/ + * command line, so this choice is ok. + */ #define COMMAND_LINE_SIZE 4096