diff options
author | Jeff Dike <jdike@addtoit.com> | 2008-02-05 01:31:14 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-05 12:44:30 -0500 |
commit | c5d4bb171cab17576779a51d23d313abcb3db102 (patch) | |
tree | 6470c3c55b172db68dfd4f880c60da72e30c488f /arch/um/kernel/process.c | |
parent | e6a2d1f7024f93e4622cd7ba633666a63ccce49e (diff) |
uml: style fixes in arch/um/kernel
Joe Perches noticed some printks in smp.c that needed fixing.
While I was in there, I did the usual tidying in arch/um/kernel, which
should be fairly style-clean at this point:
copyright updates
emacs formatting comments removal
include tidying
style fixes
Cc: Joe Perches <joe@perches.com>
Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/um/kernel/process.c')
-rw-r--r-- | arch/um/kernel/process.c | 41 |
1 files changed, 22 insertions, 19 deletions
diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c index e6d89ad10a71..c07961bedb75 100644 --- a/arch/um/kernel/process.c +++ b/arch/um/kernel/process.c | |||
@@ -4,19 +4,21 @@ | |||
4 | * Licensed under the GPL | 4 | * Licensed under the GPL |
5 | */ | 5 | */ |
6 | 6 | ||
7 | #include "linux/stddef.h" | 7 | #include <linux/stddef.h> |
8 | #include "linux/err.h" | 8 | #include <linux/err.h> |
9 | #include "linux/hardirq.h" | 9 | #include <linux/hardirq.h> |
10 | #include "linux/mm.h" | 10 | #include <linux/gfp.h> |
11 | #include "linux/personality.h" | 11 | #include <linux/mm.h> |
12 | #include "linux/proc_fs.h" | 12 | #include <linux/personality.h> |
13 | #include "linux/ptrace.h" | 13 | #include <linux/proc_fs.h> |
14 | #include "linux/random.h" | 14 | #include <linux/ptrace.h> |
15 | #include "linux/sched.h" | 15 | #include <linux/random.h> |
16 | #include "linux/tick.h" | 16 | #include <linux/sched.h> |
17 | #include "linux/threads.h" | 17 | #include <linux/tick.h> |
18 | #include "asm/pgtable.h" | 18 | #include <linux/threads.h> |
19 | #include "asm/uaccess.h" | 19 | #include <asm/current.h> |
20 | #include <asm/pgtable.h> | ||
21 | #include <asm/uaccess.h> | ||
20 | #include "as-layout.h" | 22 | #include "as-layout.h" |
21 | #include "kern_util.h" | 23 | #include "kern_util.h" |
22 | #include "os.h" | 24 | #include "os.h" |
@@ -40,7 +42,7 @@ int pid_to_processor_id(int pid) | |||
40 | { | 42 | { |
41 | int i; | 43 | int i; |
42 | 44 | ||
43 | for(i = 0; i < ncpus; i++) { | 45 | for (i = 0; i < ncpus; i++) { |
44 | if (cpu_tasks[i].pid == pid) | 46 | if (cpu_tasks[i].pid == pid) |
45 | return i; | 47 | return i; |
46 | } | 48 | } |
@@ -94,14 +96,15 @@ void *_switch_to(void *prev, void *next, void *last) | |||
94 | do { | 96 | do { |
95 | current->thread.saved_task = NULL; | 97 | current->thread.saved_task = NULL; |
96 | 98 | ||
97 | switch_threads(&from->thread.switch_buf, &to->thread.switch_buf); | 99 | switch_threads(&from->thread.switch_buf, |
100 | &to->thread.switch_buf); | ||
98 | 101 | ||
99 | arch_switch_to(current); | 102 | arch_switch_to(current); |
100 | 103 | ||
101 | if (current->thread.saved_task) | 104 | if (current->thread.saved_task) |
102 | show_regs(&(current->thread.regs)); | 105 | show_regs(&(current->thread.regs)); |
103 | next = current->thread.saved_task; | 106 | to = current->thread.saved_task; |
104 | prev = current; | 107 | from = current; |
105 | } while (current->thread.saved_task); | 108 | } while (current->thread.saved_task); |
106 | 109 | ||
107 | return current->thread.prev_sched; | 110 | return current->thread.prev_sched; |
@@ -232,7 +235,7 @@ void default_idle(void) | |||
232 | { | 235 | { |
233 | unsigned long long nsecs; | 236 | unsigned long long nsecs; |
234 | 237 | ||
235 | while(1) { | 238 | while (1) { |
236 | /* endless idle loop with no priority at all */ | 239 | /* endless idle loop with no priority at all */ |
237 | 240 | ||
238 | /* | 241 | /* |
@@ -387,7 +390,7 @@ int singlestepping(void * t) | |||
387 | { | 390 | { |
388 | struct task_struct *task = t ? t : current; | 391 | struct task_struct *task = t ? t : current; |
389 | 392 | ||
390 | if ( ! (task->ptrace & PT_DTRACE) ) | 393 | if (!(task->ptrace & PT_DTRACE)) |
391 | return 0; | 394 | return 0; |
392 | 395 | ||
393 | if (task->thread.singlestep_syscall) | 396 | if (task->thread.singlestep_syscall) |