diff options
| author | jdike <jdike> | 2003-08-07 18:57:34 +0000 |
|---|---|---|
| committer | jdike <jdike> | 2003-08-07 18:57:34 +0000 |
| commit | 3d144b4899bc6b6c6935601bfbf9422f2d1de17d (patch) | |
| tree | ccc213e9d5d36d90783992a63fab3a749c31c99d | |
| parent | d207791568d377bd2cdaee26dc0e19a405976050 (diff) | |
| download | uml-history-3d144b4899bc6b6c6935601bfbf9422f2d1de17d.tar.gz | |
Code cleanup.
| -rw-r--r-- | arch/um/include/mem_user.h | 3 | ||||
| -rw-r--r-- | arch/um/kernel/mem.c | 6 | ||||
| -rw-r--r-- | arch/um/kernel/smp.c | 8 |
3 files changed, 8 insertions, 9 deletions
diff --git a/arch/um/include/mem_user.h b/arch/um/include/mem_user.h index d80ac35..cecece9 100644 --- a/arch/um/include/mem_user.h +++ b/arch/um/include/mem_user.h @@ -51,9 +51,6 @@ extern unsigned long task_size; extern int init_mem_user(void); extern int create_mem_file(unsigned long len); -extern void setup_range(int fd, char *driver, unsigned long start, - unsigned long pfn, unsigned long total, int need_vm, - struct mem_region *region, void *reserved); extern void setup_memory(void *entry); extern unsigned long find_iomem(char *driver, unsigned long *len_out); extern int init_maps(struct mem_region *region); diff --git a/arch/um/kernel/mem.c b/arch/um/kernel/mem.c index d646b57..fca646b 100644 --- a/arch/um/kernel/mem.c +++ b/arch/um/kernel/mem.c @@ -582,9 +582,9 @@ int nregions(void) return(NREGIONS); } -void setup_range(int fd, char *driver, unsigned long start, unsigned long pfn, - unsigned long len, int need_vm, struct mem_region *region, - void *reserved) +static void setup_range(int fd, char *driver, unsigned long start, + unsigned long pfn, unsigned long len, int need_vm, + struct mem_region *region, void *reserved) { int i, cur; diff --git a/arch/um/kernel/smp.c b/arch/um/kernel/smp.c index 7fba102..500b868 100644 --- a/arch/um/kernel/smp.c +++ b/arch/um/kernel/smp.c @@ -156,11 +156,13 @@ static int idle_thread(int (*fn)(void *), int cpu) current->thread.request.u.thread.proc = fn; current->thread.request.u.thread.arg = NULL; pid = do_fork(CLONE_VM | CLONE_PID, 0, NULL, 0); - if(pid < 0) panic("do_fork failed in idle_thread"); + if(pid < 0) + panic("do_fork failed in idle_thread"); new_task = get_task(pid, 1); - cpu_tasks[cpu].pid = new_task->thread.mode.tt.extern_pid; - cpu_tasks[cpu].task = new_task; + cpu_tasks[cpu] = ((struct cpu_task) + { .pid = new_task->thread.mode.tt.extern_pid, + .task = new_task } ); init_tasks[cpu] = new_task; new_task->processor = cpu; new_task->cpus_allowed = 1 << cpu; |