summaryrefslogtreecommitdiffstats
path: root/arch/um
diff options
context:
space:
mode:
authorJeff Dike <jdike@addtoit.com>2006-07-10 04:45:09 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-07-10 13:24:23 -0700
commitbacf4549187ddb624a5d89129c7dccc0ca67ce7c (patch)
tree8f93edf174930b43c1e15da3459fa0bbd9dc2276 /arch/um
parent872aaa65a6ef30edef05a89977f7021f9840b215 (diff)
downloadkernel-crypto-bacf4549187ddb624a5d89129c7dccc0ca67ce7c.tar.gz
kernel-crypto-bacf4549187ddb624a5d89129c7dccc0ca67ce7c.tar.xz
kernel-crypto-bacf4549187ddb624a5d89129c7dccc0ca67ce7c.zip
[PATCH] uml: ifdef a mode-specific function
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@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>
Diffstat (limited to 'arch/um')
-rw-r--r--arch/um/include/kern_util.h1
-rw-r--r--arch/um/os-Linux/time.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/um/include/kern_util.h b/arch/um/include/kern_util.h
index 7a64190c1e5..b98bdd8e052 100644
--- a/arch/um/include/kern_util.h
+++ b/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 --git a/arch/um/os-Linux/time.c b/arch/um/os-Linux/time.c
index 31fb3235f55..4ae73c0e548 100644
--- a/arch/um/os-Linux/time.c
+++ b/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)
{