aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Dike <jdike@addtoit.com>2006-07-10 07:45:09 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-07-10 16:24:23 -0400
commit8ae43ff8aa60f81f5d82a4911d704ce8902d11fb (patch)
tree6aced5cef586796d00e939bcac8c2dcbd3efceaf
parentbacf4549187ddb624a5d89129c7dccc0ca67ce7c (diff)
[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.h7
-rw-r--r--arch/um/kernel/irq.c2
2 files changed, 8 insertions, 1 deletions
diff --git a/arch/um/include/irq_user.h b/arch/um/include/irq_user.h
index 69a93c804f0e..09e9e38920d5 100644
--- a/arch/um/include/irq_user.h
+++ b/arch/um/include/irq_user.h
@@ -6,6 +6,8 @@
6#ifndef __IRQ_USER_H__ 6#ifndef __IRQ_USER_H__
7#define __IRQ_USER_H__ 7#define __IRQ_USER_H__
8 8
9#include "uml-config.h"
10
9struct irq_fd { 11struct irq_fd {
10 struct irq_fd *next; 12 struct irq_fd *next;
11 void *id; 13 void *id;
@@ -26,9 +28,12 @@ extern void free_irq_by_fd(int fd);
26extern void reactivate_fd(int fd, int irqnum); 28extern void reactivate_fd(int fd, int irqnum);
27extern void deactivate_fd(int fd, int irqnum); 29extern void deactivate_fd(int fd, int irqnum);
28extern int deactivate_all_fds(void); 30extern int deactivate_all_fds(void);
29extern void forward_interrupts(int pid);
30extern int activate_ipi(int fd, int pid); 31extern int activate_ipi(int fd, int pid);
31extern unsigned long irq_lock(void); 32extern unsigned long irq_lock(void);
32extern void irq_unlock(unsigned long flags); 33extern void irq_unlock(unsigned long flags);
33 34
35#ifdef CONFIG_MODE_TT
36extern void forward_interrupts(int pid);
37#endif
38
34#endif 39#endif
diff --git a/arch/um/kernel/irq.c b/arch/um/kernel/irq.c
index bfd0bdc8cd40..519cdb0a7708 100644
--- a/arch/um/kernel/irq.c
+++ b/arch/um/kernel/irq.c
@@ -350,6 +350,7 @@ int deactivate_all_fds(void)
350 return 0; 350 return 0;
351} 351}
352 352
353#ifdef CONFIG_MODE_TT
353void forward_interrupts(int pid) 354void forward_interrupts(int pid)
354{ 355{
355 struct irq_fd *irq; 356 struct irq_fd *irq;
@@ -371,6 +372,7 @@ void forward_interrupts(int pid)
371 } 372 }
372 irq_unlock(flags); 373 irq_unlock(flags);
373} 374}
375#endif
374 376
375/* 377/*
376 * do_IRQ handles all normal device IRQ's (the special 378 * do_IRQ handles all normal device IRQ's (the special