aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjoern B. Brandenburg <bbb@cs.unc.edu>2009-05-03 01:10:19 -0400
committerBjoern B. Brandenburg <bbb@cs.unc.edu>2009-05-03 01:10:19 -0400
commit8c2ed856588664c82faf9f3df244eace68f565f3 (patch)
tree9bf46b0dbe5c3bf76b7cb33ccee4685098310e19
parent490bfb44bf7f75bba7ad7a8dea89cb2eb2865fb7 (diff)
hrtimer: remove unused flag of pull implementation
The flag was racy anyway and could not be used safely.
-rw-r--r--include/linux/hrtimer.h1
-rw-r--r--kernel/hrtimer.c5
2 files changed, 1 insertions, 5 deletions
diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h
index 4f45c83151..32d456e01d 100644
--- a/include/linux/hrtimer.h
+++ b/include/linux/hrtimer.h
@@ -205,7 +205,6 @@ struct hrtimer_cpu_base {
205 205
206#define HRTIMER_START_ON_INACTIVE 0 206#define HRTIMER_START_ON_INACTIVE 0
207#define HRTIMER_START_ON_QUEUED 1 207#define HRTIMER_START_ON_QUEUED 1
208#define HRTIMER_START_ON_PROCESSED 2
209 208
210struct hrtimer_start_on_info { 209struct hrtimer_start_on_info {
211 struct list_head list; 210 struct list_head list;
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
index b14d5922fd..2bd9fc2a59 100644
--- a/kernel/hrtimer.c
+++ b/kernel/hrtimer.c
@@ -831,8 +831,6 @@ void hrtimer_pull(void)
831 TRACE("pulled timer 0x%x\n", info->timer); 831 TRACE("pulled timer 0x%x\n", info->timer);
832 list_del(pos); 832 list_del(pos);
833 hrtimer_start(info->timer, info->time, info->mode); 833 hrtimer_start(info->timer, info->time, info->mode);
834 mb();
835 atomic_set(&info->state, HRTIMER_START_ON_PROCESSED);
836 } 834 }
837} 835}
838 836
@@ -865,7 +863,6 @@ int hrtimer_start_on(int cpu, struct hrtimer_start_on_info* info,
865 if (cpu == smp_processor_id()) { 863 if (cpu == smp_processor_id()) {
866 /* start timer locally */ 864 /* start timer locally */
867 hrtimer_start(info->timer, info->time, info->mode); 865 hrtimer_start(info->timer, info->time, info->mode);
868 atomic_set(&info->state, HRTIMER_START_ON_PROCESSED);
869 } else { 866 } else {
870 base = &per_cpu(hrtimer_bases, cpu); 867 base = &per_cpu(hrtimer_bases, cpu);
871 spin_lock_irqsave(&base->lock, flags); 868 spin_lock_irqsave(&base->lock, flags);
@@ -873,7 +870,7 @@ int hrtimer_start_on(int cpu, struct hrtimer_start_on_info* info,
873 list_add(&info->list, &base->to_pull); 870 list_add(&info->list, &base->to_pull);
874 spin_unlock_irqrestore(&base->lock, flags); 871 spin_unlock_irqrestore(&base->lock, flags);
875 if (was_empty) 872 if (was_empty)
876 /* only send IPI if other no else 873 /* only send IPI if other no else
877 * has done so already 874 * has done so already
878 */ 875 */
879 smp_send_pull_timers(cpu); 876 smp_send_pull_timers(cpu);