diff options
author | Jeff Dike <jdike@addtoit.com> | 2006-07-10 07:45:09 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-10 16:24:23 -0400 |
commit | bacf4549187ddb624a5d89129c7dccc0ca67ce7c (patch) | |
tree | 8f93edf174930b43c1e15da3459fa0bbd9dc2276 | |
parent | 872aaa65a6ef30edef05a89977f7021f9840b215 (diff) |
[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>
-rw-r--r-- | arch/um/include/kern_util.h | 1 | ||||
-rw-r--r-- | arch/um/os-Linux/time.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/um/include/kern_util.h b/arch/um/include/kern_util.h index 7a64190c1e53..b98bdd8e052a 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); | |||
72 | extern void *syscall_sp(void *t); | 72 | extern void *syscall_sp(void *t); |
73 | extern void syscall_trace(union uml_pt_regs *regs, int entryexit); | 73 | extern void syscall_trace(union uml_pt_regs *regs, int entryexit); |
74 | extern int hz(void); | 74 | extern int hz(void); |
75 | extern void uml_idle_timer(void); | ||
76 | extern unsigned int do_IRQ(int irq, union uml_pt_regs *regs); | 75 | extern unsigned int do_IRQ(int irq, union uml_pt_regs *regs); |
77 | extern int external_pid(void *t); | 76 | extern int external_pid(void *t); |
78 | extern void interrupt_end(void); | 77 | extern void interrupt_end(void); |
diff --git a/arch/um/os-Linux/time.c b/arch/um/os-Linux/time.c index 31fb3235f552..4ae73c0e5485 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) | |||
66 | errno); | 66 | errno); |
67 | } | 67 | } |
68 | 68 | ||
69 | #ifdef UML_CONFIG_MODE_TT | ||
69 | void uml_idle_timer(void) | 70 | void uml_idle_timer(void) |
70 | { | 71 | { |
71 | if(signal(SIGVTALRM, SIG_IGN) == SIG_ERR) | 72 | if(signal(SIGVTALRM, SIG_IGN) == SIG_ERR) |
@@ -75,6 +76,7 @@ void uml_idle_timer(void) | |||
75 | SA_RESTART, SIGUSR1, SIGIO, SIGWINCH, SIGVTALRM, -1); | 76 | SA_RESTART, SIGUSR1, SIGIO, SIGWINCH, SIGVTALRM, -1); |
76 | set_interval(ITIMER_REAL); | 77 | set_interval(ITIMER_REAL); |
77 | } | 78 | } |
79 | #endif | ||
78 | 80 | ||
79 | unsigned long long os_nsecs(void) | 81 | unsigned long long os_nsecs(void) |
80 | { | 82 | { |