diff options
author | Peter Zijlstra <a.p.zijlstra@chello.nl> | 2009-07-22 07:40:14 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2009-07-22 11:12:32 -0400 |
commit | fbd90375d7531927d312766b548376d909811b4d (patch) | |
tree | 3eff386f9e3d15e8f890c2a1a1cf12e100b6ab0c | |
parent | a40f262cc21fbfd781bbddcc40b16b83a75f5f34 (diff) |
hrtimer: Remove cb_entry from struct hrtimer
It's unused, remove it.
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
LKML-Reference: <new-submission>
-rw-r--r-- | include/linux/hrtimer.h | 2 | ||||
-rw-r--r-- | kernel/hrtimer.c | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h index 54648e625efd..40e7d54fc424 100644 --- a/include/linux/hrtimer.h +++ b/include/linux/hrtimer.h | |||
@@ -91,7 +91,6 @@ enum hrtimer_restart { | |||
91 | * @function: timer expiry callback function | 91 | * @function: timer expiry callback function |
92 | * @base: pointer to the timer base (per cpu and per clock) | 92 | * @base: pointer to the timer base (per cpu and per clock) |
93 | * @state: state information (See bit values above) | 93 | * @state: state information (See bit values above) |
94 | * @cb_entry: list head to enqueue an expired timer into the callback list | ||
95 | * @start_site: timer statistics field to store the site where the timer | 94 | * @start_site: timer statistics field to store the site where the timer |
96 | * was started | 95 | * was started |
97 | * @start_comm: timer statistics field to store the name of the process which | 96 | * @start_comm: timer statistics field to store the name of the process which |
@@ -108,7 +107,6 @@ struct hrtimer { | |||
108 | enum hrtimer_restart (*function)(struct hrtimer *); | 107 | enum hrtimer_restart (*function)(struct hrtimer *); |
109 | struct hrtimer_clock_base *base; | 108 | struct hrtimer_clock_base *base; |
110 | unsigned long state; | 109 | unsigned long state; |
111 | struct list_head cb_entry; | ||
112 | #ifdef CONFIG_TIMER_STATS | 110 | #ifdef CONFIG_TIMER_STATS |
113 | int start_pid; | 111 | int start_pid; |
114 | void *start_site; | 112 | void *start_site; |
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c index 43d151f185b6..052a0f53e4eb 100644 --- a/kernel/hrtimer.c +++ b/kernel/hrtimer.c | |||
@@ -1092,7 +1092,6 @@ static void __hrtimer_init(struct hrtimer *timer, clockid_t clock_id, | |||
1092 | clock_id = CLOCK_MONOTONIC; | 1092 | clock_id = CLOCK_MONOTONIC; |
1093 | 1093 | ||
1094 | timer->base = &cpu_base->clock_base[clock_id]; | 1094 | timer->base = &cpu_base->clock_base[clock_id]; |
1095 | INIT_LIST_HEAD(&timer->cb_entry); | ||
1096 | hrtimer_init_timer_hres(timer); | 1095 | hrtimer_init_timer_hres(timer); |
1097 | 1096 | ||
1098 | #ifdef CONFIG_TIMER_STATS | 1097 | #ifdef CONFIG_TIMER_STATS |