[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>

diff --git a/arch/um/include/kern_util.h b/arch/um/include/kern_util.h
index b98bdd8e052a5559993ff134eab1a5aedc467889..89e1dc835a5bf0281a7fd38b156d7b4ffe72789d 100644 (file)
--- 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 d1d799346e04580e4c62155842b8017ec3e2b298..2454bbd9555d5287f2859e9baa921a39e007c23d 100644 (file)
--- 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 55b62e2b8f415663094b571065132f7c19b17773..6b81739279d1fe059e3d23310e7b532b363be8a0 100644 (file)
--- 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);