diff options
author | Jeff Dike <jdike@addtoit.com> | 2007-05-11 01:22:32 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-11 11:29:33 -0400 |
commit | 2ea5bc5e5bb51492f189bba44045e0de7decf4a0 (patch) | |
tree | 3451944d97b58989fcc4c06ec70d9f43aaaf3b0a /arch/um/os-Linux/skas/process.c | |
parent | e1a79c400a86f2f6a6735480e31f6ee159e76fa2 (diff) |
uml: tidy IRQ code
Some tidying of the irq code before introducing irq stacks. Mostly
style fixes, but the timer handler calls the timer code directly
rather than going through the generic sig_handler_common_skas.
Signed-off-by: Jeff Dike <jdike@linux.intel.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/os-Linux/skas/process.c')
-rw-r--r-- | arch/um/os-Linux/skas/process.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/um/os-Linux/skas/process.c b/arch/um/os-Linux/skas/process.c index 3492886223e1..f9d2f8545afe 100644 --- a/arch/um/os-Linux/skas/process.c +++ b/arch/um/os-Linux/skas/process.c | |||
@@ -288,7 +288,8 @@ int start_userspace(unsigned long stub_stack) | |||
288 | void userspace(union uml_pt_regs *regs) | 288 | void userspace(union uml_pt_regs *regs) |
289 | { | 289 | { |
290 | int err, status, op, pid = userspace_pid[0]; | 290 | int err, status, op, pid = userspace_pid[0]; |
291 | int local_using_sysemu; /*To prevent races if using_sysemu changes under us.*/ | 291 | /* To prevent races if using_sysemu changes under us.*/ |
292 | int local_using_sysemu; | ||
292 | 293 | ||
293 | while(1){ | 294 | while(1){ |
294 | restore_registers(pid, regs); | 295 | restore_registers(pid, regs); |
@@ -296,7 +297,8 @@ void userspace(union uml_pt_regs *regs) | |||
296 | /* Now we set local_using_sysemu to be used for one loop */ | 297 | /* Now we set local_using_sysemu to be used for one loop */ |
297 | local_using_sysemu = get_using_sysemu(); | 298 | local_using_sysemu = get_using_sysemu(); |
298 | 299 | ||
299 | op = SELECT_PTRACE_OPERATION(local_using_sysemu, singlestepping(NULL)); | 300 | op = SELECT_PTRACE_OPERATION(local_using_sysemu, |
301 | singlestepping(NULL)); | ||
300 | 302 | ||
301 | err = ptrace(op, pid, 0, 0); | 303 | err = ptrace(op, pid, 0, 0); |
302 | if(err) | 304 | if(err) |