aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/hrtimer.c
diff options
context:
space:
mode:
authorJonathan Herman <hermanjl@cs.unc.edu>2011-10-10 16:37:01 -0400
committerJonathan Herman <hermanjl@cs.unc.edu>2011-10-10 16:37:01 -0400
commit848defae3a19b7e4b160603995db35908fa2a95c (patch)
tree290847d59897c489f37f6926005dbe78cce52782 /kernel/hrtimer.c
parentc9133cb774fa1f7390007c88fe807b681c8e08e2 (diff)
Adding events is now accomplished in O(1) time
Diffstat (limited to 'kernel/hrtimer.c')
-rw-r--r--kernel/hrtimer.c6
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 */
1086void hrtimer_pull_cancel(int cpu, struct hrtimer *timer, 1086int 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/**