aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/exit.c
diff options
context:
space:
mode:
authorOleg Nesterov <oleg@tv-sign.ru>2006-03-28 19:11:19 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-28 21:36:43 -0500
commit35f5cad8c4bab94ecc5acdc4055df5ea12dc76f8 (patch)
treeaad78b130b697c3c4b594483c63a9b1a9c4ed009 /kernel/exit.c
parent6a14c5c9da0b4c34b5be783403c54f0396fcfe77 (diff)
[PATCH] revert "Optimize sys_times for a single thread process"
This patch reverts 'CONFIG_SMP && thread_group_empty()' optimization in sys_times(). The reason is that the next patch breaks memory ordering which is needed for that optimization. tasklist_lock in sys_times() will be eliminated completely by further patch. Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel/exit.c')
-rw-r--r--kernel/exit.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/kernel/exit.c b/kernel/exit.c
index 3823ec89d7b8..6b2e4cf3e140 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -139,11 +139,7 @@ repeat:
139 ptrace_unlink(p); 139 ptrace_unlink(p);
140 BUG_ON(!list_empty(&p->ptrace_list) || !list_empty(&p->ptrace_children)); 140 BUG_ON(!list_empty(&p->ptrace_list) || !list_empty(&p->ptrace_children));
141 __exit_signal(p); 141 __exit_signal(p);
142 /* 142
143 * Note that the fastpath in sys_times depends on __exit_signal having
144 * updated the counters before a task is removed from the tasklist of
145 * the process by __unhash_process.
146 */
147 __unhash_process(p); 143 __unhash_process(p);
148 144
149 /* 145 /*