diff options
| author | Jeff Dike <jdike@addtoit.com> | 2006-09-26 02:33:06 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-26 11:49:08 -0400 |
| commit | 602cc2418177a5b80f533f569e5a42c4495988c9 (patch) | |
| tree | a2b218e7850cbb2622de9dd20b3ea4f9895bd74f | |
| parent | 537ae946e808d0f22d660f7a3500832fe0c07d14 (diff) | |
[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 b98bdd8e052a..89e1dc835a5b 100644 --- a/arch/um/include/kern_util.h +++ b/arch/um/include/kern_util.h | |||
| @@ -27,7 +27,6 @@ extern int ncpus; | |||
| 27 | extern char *linux_prog; | 27 | extern char *linux_prog; |
| 28 | extern char *gdb_init; | 28 | extern char *gdb_init; |
| 29 | extern int kmalloc_ok; | 29 | extern int kmalloc_ok; |
| 30 | extern int timer_irq_inited; | ||
| 31 | extern int jail; | 30 | extern int jail; |
| 32 | extern int nsyscalls; | 31 | extern int nsyscalls; |
| 33 | 32 | ||
diff --git a/arch/um/kernel/time.c b/arch/um/kernel/time.c index d1d799346e04..2454bbd9555d 100644 --- a/arch/um/kernel/time.c +++ b/arch/um/kernel/time.c | |||
| @@ -35,9 +35,6 @@ unsigned long long sched_clock(void) | |||
| 35 | return (unsigned long long)jiffies_64 * (1000000000 / HZ); | 35 | return (unsigned long long)jiffies_64 * (1000000000 / HZ); |
| 36 | } | 36 | } |
| 37 | 37 | ||
| 38 | /* Changed at early boot */ | ||
| 39 | int timer_irq_inited = 0; | ||
| 40 | |||
| 41 | static unsigned long long prev_nsecs; | 38 | static unsigned long long prev_nsecs; |
| 42 | #ifdef CONFIG_UML_REAL_TIME_CLOCK | 39 | #ifdef CONFIG_UML_REAL_TIME_CLOCK |
| 43 | static long long delta; /* Deviation per interval */ | 40 | static long long delta; /* Deviation per interval */ |
| @@ -116,8 +113,6 @@ static void register_timer(void) | |||
| 116 | printk(KERN_ERR "register_timer : request_irq failed - " | 113 | printk(KERN_ERR "register_timer : request_irq failed - " |
| 117 | "errno = %d\n", -err); | 114 | "errno = %d\n", -err); |
| 118 | 115 | ||
| 119 | timer_irq_inited = 1; | ||
| 120 | |||
| 121 | err = set_interval(1); | 116 | err = set_interval(1); |
| 122 | if(err != 0) | 117 | if(err != 0) |
| 123 | printk(KERN_ERR "register_timer : set_interval failed - " | 118 | 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 55b62e2b8f41..6b81739279d1 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) | |||
| 55 | set_signals(enabled); | 55 | set_signals(enabled); |
| 56 | } | 56 | } |
| 57 | 57 | ||
| 58 | extern int timer_irq_inited; | ||
| 59 | |||
| 60 | static void real_alarm_handler(int sig, struct sigcontext *sc) | 58 | static void real_alarm_handler(int sig, struct sigcontext *sc) |
| 61 | { | 59 | { |
| 62 | if(!timer_irq_inited){ | ||
| 63 | signals_enabled = 1; | ||
| 64 | return; | ||
| 65 | } | ||
| 66 | |||
| 67 | if(sig == SIGALRM) | 60 | if(sig == SIGALRM) |
| 68 | switch_timers(0); | 61 | switch_timers(0); |
| 69 | 62 | ||
