From 56793e43ab56cdf9d536b492d2ba5d52cc72a1d6 Mon Sep 17 00:00:00 2001
From: Oleg Nesterov <oleg@tv-sign.ru>
Date: Thu, 15 Jun 2006 20:12:02 +0400
Subject: [PATCH] --- yaml --- r: 27219 b: refs/heads/master c:
 f53ae1dc3429529a58aa538e0a860d713c7079c3 h: refs/heads/master i:   27217:
 55ebb808a086a8f6b4d01231c383923aaeb6a03f   27215:
 cf19f0122df269bbb4a67094fec53079c120285e v: v3

---
 [refs]                          | 2 +-
 trunk/kernel/posix-cpu-timers.c | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 5d404b071f6c..865394ed1a57 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 30f1e3dd8c72abda343bcf415f7d8894a02b4290
+refs/heads/master: f53ae1dc3429529a58aa538e0a860d713c7079c3
diff --git a/trunk/kernel/posix-cpu-timers.c b/trunk/kernel/posix-cpu-timers.c
index 4882bf1e094a..d38d9ec3276c 100644
--- a/trunk/kernel/posix-cpu-timers.c
+++ b/trunk/kernel/posix-cpu-timers.c
@@ -555,9 +555,6 @@ static void arm_timer(struct k_itimer *timer, union cpu_time_count now)
 	struct cpu_timer_list *next;
 	unsigned long i;
 
-	if (CPUCLOCK_PERTHREAD(timer->it_clock)	&& (p->flags & PF_EXITING))
-		return;
-
 	head = (CPUCLOCK_PERTHREAD(timer->it_clock) ?
 		p->cpu_timers : p->signal->cpu_timers);
 	head += CPUCLOCK_WHICH(timer->it_clock);