From 9690281788e438c8ed87a1aad6b8ee9123a13948 Mon Sep 17 00:00:00 2001 From: Peter Zijlstra Date: Wed, 22 Jul 2009 13:40:14 +0200 Subject: [PATCH] --- yaml --- r: 163053 b: refs/heads/master c: fbd90375d7531927d312766b548376d909811b4d h: refs/heads/master i: 163051: 989b81ef47879189f36b0141798d8364bd3a2ff1 v: v3 --- [refs] | 2 +- trunk/include/linux/hrtimer.h | 2 -- trunk/kernel/hrtimer.c | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 200654376ffd..f217223da2d8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a40f262cc21fbfd781bbddcc40b16b83a75f5f34 +refs/heads/master: fbd90375d7531927d312766b548376d909811b4d diff --git a/trunk/include/linux/hrtimer.h b/trunk/include/linux/hrtimer.h index 54648e625efd..40e7d54fc424 100644 --- a/trunk/include/linux/hrtimer.h +++ b/trunk/include/linux/hrtimer.h @@ -91,7 +91,6 @@ enum hrtimer_restart { * @function: timer expiry callback function * @base: pointer to the timer base (per cpu and per clock) * @state: state information (See bit values above) - * @cb_entry: list head to enqueue an expired timer into the callback list * @start_site: timer statistics field to store the site where the timer * was started * @start_comm: timer statistics field to store the name of the process which @@ -108,7 +107,6 @@ struct hrtimer { enum hrtimer_restart (*function)(struct hrtimer *); struct hrtimer_clock_base *base; unsigned long state; - struct list_head cb_entry; #ifdef CONFIG_TIMER_STATS int start_pid; void *start_site; diff --git a/trunk/kernel/hrtimer.c b/trunk/kernel/hrtimer.c index 43d151f185b6..052a0f53e4eb 100644 --- a/trunk/kernel/hrtimer.c +++ b/trunk/kernel/hrtimer.c @@ -1092,7 +1092,6 @@ static void __hrtimer_init(struct hrtimer *timer, clockid_t clock_id, clock_id = CLOCK_MONOTONIC; timer->base = &cpu_base->clock_base[clock_id]; - INIT_LIST_HEAD(&timer->cb_entry); hrtimer_init_timer_hres(timer); #ifdef CONFIG_TIMER_STATS