The patch titled
uml: mark forward_interrupts as being mode-specific
has been removed from the -mm tree. Its filename is
uml-mark-forward_interrupts-as-being-mode-specific.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: uml: mark forward_interrupts as being mode-specific
From: Jeff Dike <jdike@xxxxxxxxxxx>
Mark forward_interrupts as being tt-mode only.
Signed-off-by: Jeff Dike <jdike@xxxxxxxxxxx>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@xxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/um/include/irq_user.h | 7 ++++++-
arch/um/kernel/irq.c | 2 ++
2 files changed, 8 insertions(+), 1 deletion(-)
diff -puN arch/um/include/irq_user.h~uml-mark-forward_interrupts-as-being-mode-specific arch/um/include/irq_user.h
--- a/arch/um/include/irq_user.h~uml-mark-forward_interrupts-as-being-mode-specific
+++ a/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 -puN arch/um/kernel/irq.c~uml-mark-forward_interrupts-as-being-mode-specific arch/um/kernel/irq.c
--- a/arch/um/kernel/irq.c~uml-mark-forward_interrupts-as-being-mode-specific
+++ a/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
_
Patches currently in -mm which might be from jdike@xxxxxxxxxxx are
origin.patch
uml-remove-pte_mkexec.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
