Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 602cc241 authored by Jeff Dike's avatar Jeff Dike Committed by Linus Torvalds
Browse files

[PATCH] uml: Remove unused variable 



timer_irq_inited was useless, so it is removed.

Signed-off-by: default avatarJeff Dike <jdike@addtoit.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 537ae946

arch/um/include/kern_util.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -27,7 +27,6 @@ extern int ncpus; 
extern char *linux_prog;

extern char *linux_prog;

extern char *gdb_init;

extern char *gdb_init;

extern int kmalloc_ok;

extern int kmalloc_ok;

extern int timer_irq_inited;

extern int jail;

extern int jail;

extern int nsyscalls;

extern int nsyscalls;

arch/um/kernel/time.c

+0 −5
Original line number Original line Diff line number Diff line
@@ -35,9 +35,6 @@ unsigned long long sched_clock(void) 
	return (unsigned long long)jiffies_64 * (1000000000 / HZ);

	return (unsigned long long)jiffies_64 * (1000000000 / HZ);

}

}





/* Changed at early boot */

int timer_irq_inited = 0;



static unsigned long long prev_nsecs;

static unsigned long long prev_nsecs;

#ifdef CONFIG_UML_REAL_TIME_CLOCK

#ifdef CONFIG_UML_REAL_TIME_CLOCK

static long long delta;   		/* Deviation per interval */

static long long delta;   		/* Deviation per interval */
@@ -116,8 +113,6 @@ static void register_timer(void) 
		printk(KERN_ERR "register_timer : request_irq failed - "

		printk(KERN_ERR "register_timer : request_irq failed - "

		       "errno = %d\n", -err);

		       "errno = %d\n", -err);





	timer_irq_inited = 1;



	err = set_interval(1);

	err = set_interval(1);

	if(err != 0)

	if(err != 0)

		printk(KERN_ERR "register_timer : set_interval failed - "

		printk(KERN_ERR "register_timer : set_interval failed - "

arch/um/os-Linux/signal.c

+0 −7
Original line number Original line Diff line number Diff line
@@ -55,15 +55,8 @@ void sig_handler(int sig, struct sigcontext *sc) 
	set_signals(enabled);

	set_signals(enabled);

}

}





extern int timer_irq_inited;



static void real_alarm_handler(int sig, struct sigcontext *sc)

static void real_alarm_handler(int sig, struct sigcontext *sc)

{

{

	if(!timer_irq_inited){

		signals_enabled = 1;

		return;

	}



	if(sig == SIGALRM)

	if(sig == SIGALRM)

		switch_timers(0);

		switch_timers(0);