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

Commit 9d71bdfb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull timer fixlet from Ingo Molnar:
 "Remove an unused variable"

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  alarmtimer: Remove unused but set variable
parents 2c11fc87 54e23845

kernel/time/alarmtimer.c

+0 −2
Original line number Diff line number Diff line
@@ -542,7 +542,6 @@ static int alarm_clock_get(clockid_t which_clock, struct timespec *tp) 
static int alarm_timer_create(struct k_itimer *new_timer)

{

	enum  alarmtimer_type type;

	struct alarm_base *base;



	if (!alarmtimer_get_rtcdev())

		return -ENOTSUPP;
@@ -551,7 +550,6 @@ static int alarm_timer_create(struct k_itimer *new_timer) 
		return -EPERM;



	type = clock2alarm(new_timer->it_clock);

	base = &alarm_bases[type];

	alarm_init(&new_timer->it.alarm.alarmtimer, type, alarm_handle_timer);

	return 0;

}