diff options
| author | Jeff Dike <jdike@addtoit.com> | 2007-10-16 01:26:58 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-16 09:43:05 -0700 |
| commit | 77bf4400319db9d2a8af6b00c2be6faa0f3d07cb (patch) | |
| tree | ddc8fd48349b8d4dd2c0b26bce7f52f79b4e4077 /arch/um/kernel/time.c | |
| parent | ae2587e41254e48e670346aefa332d7469d86352 (diff) | |
uml: remove code made redundant by CHOOSE_MODE removal
This patch makes a number of simplifications enabled by the removal of
CHOOSE_MODE. There were lots of functions that looked like
int foo(args){
foo_skas(args);
}
The bodies of foo_skas are now folded into foo, and their declarations (and
sometimes entire header files) are deleted.
In addition, the union uml_pt_regs, which was a union between the tt and skas
register formats, is now a struct, with the tt-mode arm of the union being
removed.
It turns out that usr2_handler was unused, so it is gone.
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/time.c')
| -rw-r--r-- | arch/um/kernel/time.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/um/kernel/time.c b/arch/um/kernel/time.c index 3571703a7cb4..90e24e2dbeaa 100644 --- a/arch/um/kernel/time.c +++ b/arch/um/kernel/time.c @@ -18,7 +18,6 @@ #include "asm/param.h" #include "asm/current.h" #include "kern_util.h" -#include "mode.h" #include "os.h" int hz(void) @@ -39,7 +38,7 @@ static unsigned long long prev_nsecs[NR_CPUS]; static long long delta[NR_CPUS]; /* Deviation per interval */ #endif -void timer_irq(union uml_pt_regs *regs) +void timer_irq(struct uml_pt_regs *regs) { unsigned long long ticks = 0; #ifdef CONFIG_UML_REAL_TIME_CLOCK @@ -175,13 +174,13 @@ int do_settimeofday(struct timespec *tv) return 0; } -void timer_handler(int sig, union uml_pt_regs *regs) +void timer_handler(int sig, struct uml_pt_regs *regs) { if(current_thread->cpu == 0) timer_irq(regs); local_irq_disable(); irq_enter(); - update_process_times((regs)->skas.is_user); + update_process_times(regs->is_user); irq_exit(); local_irq_enable(); } |