diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-18 09:57:12 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-10-18 09:57:12 -0700 |
| commit | 9d71bdfbcba12b55ed671166896cd785dcd57216 (patch) | |
| tree | 52dc896dfcb546c1aefc35dc52b6b594ee54f74f /kernel | |
| parent | 2c11fc87caa9a60ada54f4bfc97f7b1abc38d7d0 (diff) | |
| parent | 54e23845e965898f65f76aba79fa9db76d830fa9 (diff) | |
| download | talos-obmc-linux-9d71bdfbcba12b55ed671166896cd785dcd57216.tar.gz talos-obmc-linux-9d71bdfbcba12b55ed671166896cd785dcd57216.zip | |
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
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/time/alarmtimer.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c index c3aad685bbc0..12dd190634ab 100644 --- a/kernel/time/alarmtimer.c +++ b/kernel/time/alarmtimer.c @@ -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; } |
