aboutsummaryrefslogtreecommitdiffstats
path: root/arch/um/kernel/um_arch.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/um/kernel/um_arch.c')
-rw-r--r--arch/um/kernel/um_arch.c14
1 files changed, 4 insertions, 10 deletions
diff --git a/arch/um/kernel/um_arch.c b/arch/um/kernel/um_arch.c
index 5c49d88eed3d..8736d098f0ee 100644
--- a/arch/um/kernel/um_arch.c
+++ b/arch/um/kernel/um_arch.c
@@ -23,9 +23,9 @@
23#include "asm/ptrace.h" 23#include "asm/ptrace.h"
24#include "asm/elf.h" 24#include "asm/elf.h"
25#include "asm/user.h" 25#include "asm/user.h"
26#include "asm/setup.h"
26#include "ubd_user.h" 27#include "ubd_user.h"
27#include "asm/current.h" 28#include "asm/current.h"
28#include "asm/setup.h"
29#include "user_util.h" 29#include "user_util.h"
30#include "kern_util.h" 30#include "kern_util.h"
31#include "kern.h" 31#include "kern.h"
@@ -42,9 +42,9 @@
42#define DEFAULT_COMMAND_LINE "root=98:0" 42#define DEFAULT_COMMAND_LINE "root=98:0"
43 43
44/* Changed in linux_main and setup_arch, which run before SMP is started */ 44/* Changed in linux_main and setup_arch, which run before SMP is started */
45char command_line[COMMAND_LINE_SIZE] = { 0 }; 45static char command_line[COMMAND_LINE_SIZE] = { 0 };
46 46
47void add_arg(char *arg) 47static void add_arg(char *arg)
48{ 48{
49 if (strlen(command_line) + strlen(arg) + 1 > COMMAND_LINE_SIZE) { 49 if (strlen(command_line) + strlen(arg) + 1 > COMMAND_LINE_SIZE) {
50 printf("add_arg: Too many command line arguments!\n"); 50 printf("add_arg: Too many command line arguments!\n");
@@ -110,12 +110,6 @@ struct seq_operations cpuinfo_op = {
110 .show = show_cpuinfo, 110 .show = show_cpuinfo,
111}; 111};
112 112
113pte_t * __bad_pagetable(void)
114{
115 panic("Someone should implement __bad_pagetable");
116 return(NULL);
117}
118
119/* Set in linux_main */ 113/* Set in linux_main */
120unsigned long host_task_size; 114unsigned long host_task_size;
121unsigned long task_size; 115unsigned long task_size;
@@ -449,7 +443,7 @@ void __init setup_arch(char **cmdline_p)
449{ 443{
450 notifier_chain_register(&panic_notifier_list, &panic_exit_notifier); 444 notifier_chain_register(&panic_notifier_list, &panic_exit_notifier);
451 paging_init(); 445 paging_init();
452 strlcpy(saved_command_line, command_line, COMMAND_LINE_SIZE); 446 strlcpy(saved_command_line, command_line, COMMAND_LINE_SIZE);
453 *cmdline_p = command_line; 447 *cmdline_p = command_line;
454 setup_hostinfo(); 448 setup_hostinfo();
455} 449}