diff options
| author | Jeff Dike <jdike@addtoit.com> | 2006-07-10 04:45:09 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-10 13:24:23 -0700 |
| commit | 8ae43ff8aa60f81f5d82a4911d704ce8902d11fb (patch) | |
| tree | 6aced5cef586796d00e939bcac8c2dcbd3efceaf | |
| parent | bacf4549187ddb624a5d89129c7dccc0ca67ce7c (diff) | |
| download | linux-3.10-8ae43ff8aa60f81f5d82a4911d704ce8902d11fb.tar.gz linux-3.10-8ae43ff8aa60f81f5d82a4911d704ce8902d11fb.tar.bz2 linux-3.10-8ae43ff8aa60f81f5d82a4911d704ce8902d11fb.zip | |
[PATCH] uml: mark forward_interrupts as being mode-specific
Mark forward_interrupts as being tt-mode only.
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | arch/um/include/irq_user.h | 7 | ||||
| -rw-r--r-- | arch/um/kernel/irq.c | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/arch/um/include/irq_user.h b/arch/um/include/irq_user.h index 69a93c804f0..09e9e38920d 100644 --- a/arch/um/include/irq_user.h +++ b/arch/um/include/irq_user.h @@ -6,6 +6,8 @@ #ifndef __IRQ_USER_H__ #define __IRQ_USER_H__ +#include "uml-config.h" + struct irq_fd { struct irq_fd *next; void *id; @@ -26,9 +28,12 @@ extern void free_irq_by_fd(int fd); extern void reactivate_fd(int fd, int irqnum); extern void deactivate_fd(int fd, int irqnum); extern int deactivate_all_fds(void); -extern void forward_interrupts(int pid); extern int activate_ipi(int fd, int pid); extern unsigned long irq_lock(void); extern void irq_unlock(unsigned long flags); +#ifdef CONFIG_MODE_TT +extern void forward_interrupts(int pid); +#endif + #endif diff --git a/arch/um/kernel/irq.c b/arch/um/kernel/irq.c index bfd0bdc8cd4..519cdb0a770 100644 --- a/arch/um/kernel/irq.c +++ b/arch/um/kernel/irq.c @@ -350,6 +350,7 @@ int deactivate_all_fds(void) return 0; } +#ifdef CONFIG_MODE_TT void forward_interrupts(int pid) { struct irq_fd *irq; @@ -371,6 +372,7 @@ void forward_interrupts(int pid) } irq_unlock(flags); } +#endif /* * do_IRQ handles all normal device IRQ's (the special |