diff options
| author | Jeff Dike <jdike@addtoit.com> | 2006-09-25 23:33:06 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-26 08:49:08 -0700 |
| commit | 602cc2418177a5b80f533f569e5a42c4495988c9 (patch) | |
| tree | a2b218e7850cbb2622de9dd20b3ea4f9895bd74f | |
| parent | 537ae946e808d0f22d660f7a3500832fe0c07d14 (diff) | |
| download | linux-3.10-602cc2418177a5b80f533f569e5a42c4495988c9.tar.gz linux-3.10-602cc2418177a5b80f533f569e5a42c4495988c9.tar.bz2 linux-3.10-602cc2418177a5b80f533f569e5a42c4495988c9.zip | |
[PATCH] uml: Remove unused variable
timer_irq_inited was useless, so it is removed.
Signed-off-by: Jeff Dike <jdike@addtoit.com>
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/kernel/time.c | 5 | ||||
| -rw-r--r-- | arch/um/os-Linux/signal.c | 7 |
3 files changed, 0 insertions, 13 deletions
diff --git a/arch/um/include/kern_util.h b/arch/um/include/kern_util.h index b98bdd8e052..89e1dc835a5 100644 --- a/arch/um/include/kern_util.h +++ b/arch/um/include/kern_util.h @@ -27,7 +27,6 @@ extern int ncpus; extern char *linux_prog; extern char *gdb_init; extern int kmalloc_ok; -extern int timer_irq_inited; extern int jail; extern int nsyscalls; diff --git a/arch/um/kernel/time.c b/arch/um/kernel/time.c index d1d799346e0..2454bbd9555 100644 --- a/arch/um/kernel/time.c +++ b/arch/um/kernel/time.c @@ -35,9 +35,6 @@ unsigned long long sched_clock(void) return (unsigned long long)jiffies_64 * (1000000000 / HZ); } -/* Changed at early boot */ -int timer_irq_inited = 0; - static unsigned long long prev_nsecs; #ifdef CONFIG_UML_REAL_TIME_CLOCK static long long delta; /* Deviation per interval */ @@ -116,8 +113,6 @@ static void register_timer(void) printk(KERN_ERR "register_timer : request_irq failed - " "errno = %d\n", -err); - timer_irq_inited = 1; - err = set_interval(1); if(err != 0) printk(KERN_ERR "register_timer : set_interval failed - " diff --git a/arch/um/os-Linux/signal.c b/arch/um/os-Linux/signal.c index 55b62e2b8f4..6b81739279d 100644 --- a/arch/um/os-Linux/signal.c +++ b/arch/um/os-Linux/signal.c @@ -55,15 +55,8 @@ void sig_handler(int sig, struct sigcontext *sc) set_signals(enabled); } -extern int timer_irq_inited; - static void real_alarm_handler(int sig, struct sigcontext *sc) { - if(!timer_irq_inited){ - signals_enabled = 1; - return; - } - if(sig == SIGALRM) switch_timers(0); |