X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=kernel%2Fexit.c;h=cce59cb5ee6aececf1b663d39a1de3fb15b4b426;hb=20dba4596fd768b2d9154e3258871ebdd2c9fa29;hp=45ed043b8bf59b8704b7cc13f19b1b13824b7ce4;hpb=915a0b575fdb2376135ed9334b3ccb1eb51db622;p=~andy%2Flinux

diff --git a/kernel/exit.c b/kernel/exit.c
index 45ed043b8bf..cce59cb5ee6 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -87,7 +87,7 @@ static void __exit_signal(struct task_struct *tsk)
 
 	sighand = rcu_dereference_check(tsk->sighand,
 					rcu_read_lock_held() ||
-					lockdep_is_held(&tasklist_lock));
+					lockdep_tasklist_lock_is_held());
 	spin_lock(&sighand->siglock);
 
 	posix_cpu_timers_exit(tsk);
@@ -952,7 +952,8 @@ NORET_TYPE void do_exit(long code)
 				preempt_count());
 
 	acct_update_integrals(tsk);
-
+	/* sync mm's RSS info before statistics gathering */
+	sync_mm_rss(tsk, tsk->mm);
 	group_dead = atomic_dec_and_test(&tsk->signal->live);
 	if (group_dead) {
 		hrtimer_cancel(&tsk->signal->real_timer);
@@ -1188,7 +1189,7 @@ static int wait_task_zombie(struct wait_opts *wo, struct task_struct *p)
 
 	if (unlikely(wo->wo_flags & WNOWAIT)) {
 		int exit_code = p->exit_code;
-		int why, status;
+		int why;
 
 		get_task_struct(p);
 		read_unlock(&tasklist_lock);