The patch titled
uml: ifdef a mode-specific function
has been removed from the -mm tree. Its filename is
uml-ifdef-a-mode-specific-function.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: uml: ifdef a mode-specific function
From: Jeff Dike <jdike@xxxxxxxxxxx>
uml_idle_timer is tt-mode only, so ifdef it as such to make it easier to spot
when tt mode is killed.
Signed-off-by: Jeff Dike <jdike@xxxxxxxxxxx>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@xxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/um/include/kern_util.h | 1 -
arch/um/os-Linux/time.c | 2 ++
2 files changed, 2 insertions(+), 1 deletion(-)
diff -puN arch/um/include/kern_util.h~uml-ifdef-a-mode-specific-function arch/um/include/kern_util.h
--- a/arch/um/include/kern_util.h~uml-ifdef-a-mode-specific-function
+++ a/arch/um/include/kern_util.h
@@ -72,7 +72,6 @@ extern void init_flush_vm(void);
extern void *syscall_sp(void *t);
extern void syscall_trace(union uml_pt_regs *regs, int entryexit);
extern int hz(void);
-extern void uml_idle_timer(void);
extern unsigned int do_IRQ(int irq, union uml_pt_regs *regs);
extern int external_pid(void *t);
extern void interrupt_end(void);
diff -puN arch/um/os-Linux/time.c~uml-ifdef-a-mode-specific-function arch/um/os-Linux/time.c
--- a/arch/um/os-Linux/time.c~uml-ifdef-a-mode-specific-function
+++ a/arch/um/os-Linux/time.c
@@ -66,6 +66,7 @@ void switch_timers(int to_real)
errno);
}
+#ifdef UML_CONFIG_MODE_TT
void uml_idle_timer(void)
{
if(signal(SIGVTALRM, SIG_IGN) == SIG_ERR)
@@ -75,6 +76,7 @@ void uml_idle_timer(void)
SA_RESTART, SIGUSR1, SIGIO, SIGWINCH, SIGVTALRM, -1);
set_interval(ITIMER_REAL);
}
+#endif
unsigned long long os_nsecs(void)
{
_
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
