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
This commit is contained in:
Коммит
9d71bdfbcb
|
@ -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;
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче