diff options
author | Jeff Dike <jdike@addtoit.com> | 2007-10-16 04:26:58 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-16 12:43:05 -0400 |
commit | 77bf4400319db9d2a8af6b00c2be6faa0f3d07cb (patch) | |
tree | ddc8fd48349b8d4dd2c0b26bce7f52f79b4e4077 /arch/um/kernel/irq.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/irq.c')
-rw-r--r-- | arch/um/kernel/irq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/um/kernel/irq.c b/arch/um/kernel/irq.c index ec1ed680032b..b10ee28b97cb 100644 --- a/arch/um/kernel/irq.c +++ b/arch/um/kernel/irq.c | |||
@@ -91,7 +91,7 @@ static struct irq_fd **last_irq_ptr = &active_fds; | |||
91 | 91 | ||
92 | extern void free_irqs(void); | 92 | extern void free_irqs(void); |
93 | 93 | ||
94 | void sigio_handler(int sig, union uml_pt_regs *regs) | 94 | void sigio_handler(int sig, struct uml_pt_regs *regs) |
95 | { | 95 | { |
96 | struct irq_fd *irq_fd; | 96 | struct irq_fd *irq_fd; |
97 | int n; | 97 | int n; |
@@ -344,7 +344,7 @@ int deactivate_all_fds(void) | |||
344 | * SMP cross-CPU interrupts have their own specific | 344 | * SMP cross-CPU interrupts have their own specific |
345 | * handlers). | 345 | * handlers). |
346 | */ | 346 | */ |
347 | unsigned int do_IRQ(int irq, union uml_pt_regs *regs) | 347 | unsigned int do_IRQ(int irq, struct uml_pt_regs *regs) |
348 | { | 348 | { |
349 | struct pt_regs *old_regs = set_irq_regs((struct pt_regs *)regs); | 349 | struct pt_regs *old_regs = set_irq_regs((struct pt_regs *)regs); |
350 | irq_enter(); | 350 | irq_enter(); |