Gitweb:     http://git.kernel.org/linus/5eb9aa6414bdab6d075a8763bc3b647181ef3aab
Commit:     5eb9aa6414bdab6d075a8763bc3b647181ef3aab
Parent:     f55db609042faecd5e518ce372b87f846659b32e
Author:     Stanislaw Gruszka <sgruszka@redhat.com>
AuthorDate: Thu Mar 11 14:04:38 2010 -0800
Committer:  Thomas Gleixner <tglx@linutronix.de>
CommitDate: Fri Mar 12 22:40:39 2010 +0100

    cpu-timers: Cleanup arm_timer()
    
    Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
    Cc: Ingo Molnar <mingo@elte.hu>
    Cc: Oleg Nesterov <oleg@redhat.com>
    Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Cc: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
    Cc: Balbir Singh <balbir@in.ibm.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
 kernel/posix-cpu-timers.c |  104 +++++++++++++++------------------------------
 1 files changed, 35 insertions(+), 69 deletions(-)

diff --git a/kernel/posix-cpu-timers.c b/kernel/posix-cpu-timers.c
index d01e0a3..7c7166f 100644
--- a/kernel/posix-cpu-timers.c
+++ b/kernel/posix-cpu-timers.c
@@ -547,97 +547,63 @@ static inline int expires_gt(cputime_t expires, cputime_t new_exp)
 	       cputime_gt(expires, new_exp);
 }
 
-static inline int expires_le(cputime_t expires, cputime_t new_exp)
-{
-	return !cputime_eq(expires, cputime_zero) &&
-	       cputime_le(expires, new_exp);
-}
 /*
  * Insert the timer on the appropriate list before any timers that
  * expire later.  This must be called with the tasklist_lock held
  * for reading, and interrupts disabled.
  */
-static void arm_timer(struct k_itimer *timer, union cpu_time_count now)
+static void arm_timer(struct k_itimer *timer)
 {
 	struct task_struct *p = timer->it.cpu.task;
 	struct list_head *head, *listpos;
+	struct task_cputime *cputime_expires;
 	struct cpu_timer_list *const nt = &timer->it.cpu;
 	struct cpu_timer_list *next;
 
-	head = (CPUCLOCK_PERTHREAD(timer->it_clock) ?
-		p->cpu_timers : ...
[ message continues ]