diff options
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/hrtimer.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c index a8c3135dfed5..c215ddbf49d0 100644 --- a/kernel/hrtimer.c +++ b/kernel/hrtimer.c | |||
@@ -1083,8 +1083,8 @@ void hrtimer_pull(void) | |||
1083 | /** | 1083 | /** |
1084 | * hrtimer_pull_cancel - Cancel a remote timer pull | 1084 | * hrtimer_pull_cancel - Cancel a remote timer pull |
1085 | */ | 1085 | */ |
1086 | void hrtimer_pull_cancel(int cpu, struct hrtimer *timer, | 1086 | int hrtimer_pull_cancel(int cpu, struct hrtimer *timer, |
1087 | struct hrtimer_start_on_info *info) | 1087 | struct hrtimer_start_on_info *info) |
1088 | { | 1088 | { |
1089 | struct hrtimer_cpu_base *base = &per_cpu(hrtimer_bases, cpu); | 1089 | struct hrtimer_cpu_base *base = &per_cpu(hrtimer_bases, cpu); |
1090 | 1090 | ||
@@ -1093,7 +1093,7 @@ void hrtimer_pull_cancel(int cpu, struct hrtimer *timer, | |||
1093 | raw_spin_unlock(&base->lock); | 1093 | raw_spin_unlock(&base->lock); |
1094 | 1094 | ||
1095 | atomic_set(&info->state, HRTIMER_START_ON_INACTIVE); | 1095 | atomic_set(&info->state, HRTIMER_START_ON_INACTIVE); |
1096 | hrtimer_try_to_cancel(timer); | 1096 | return hrtimer_try_to_cancel(timer); |
1097 | } | 1097 | } |
1098 | 1098 | ||
1099 | /** | 1099 | /** |