[kernel] r18745 - dists/lenny-security/linux-2.6/debian/patches/features/all/openvz

[Dann Frazier]

Author: dannf
Date: Mon Feb 27 01:13:21 2012
New Revision: 18745

Log:
Adjust to apply

Modified:
   dists/lenny-security/linux-2.6/debian/patches/features/all/openvz/openvz.patch

Modified: dists/lenny-security/linux-2.6/debian/patches/features/all/openvz/openvz.patch
==============================================================================
--- dists/lenny-security/linux-2.6/debian/patches/features/all/openvz/openvz.patch	Mon Feb 27 01:13:15 2012	(r18744)
+++ dists/lenny-security/linux-2.6/debian/patches/features/all/openvz/openvz.patch	Mon Feb 27 01:13:21 2012	(r18745)
@@ -58987,25 +58987,6 @@
  
  	/* mt-exec, de_thread() is waiting for us */
  	if (thread_group_leader(tsk) &&
-@@ -1023,12 +1049,14 @@ NORET_TYPE void do_exit(long code)
- 	}
- 	acct_collect(code, group_dead);
- #ifdef CONFIG_FUTEX
--	if (unlikely(tsk->robust_list))
--		exit_robust_list(tsk);
-+	if (!(tsk->flags & PF_EXIT_RESTART)) {
-+		if (unlikely(tsk->robust_list))
-+			exit_robust_list(tsk);
- #ifdef CONFIG_COMPAT
--	if (unlikely(tsk->compat_robust_list))
--		compat_exit_robust_list(tsk);
-+		if (unlikely(tsk->compat_robust_list))
-+			compat_exit_robust_list(tsk);
- #endif
-+	}
- #endif
- 	if (group_dead)
- 		tty_audit_exit();
 @@ -1057,8 +1085,16 @@ NORET_TYPE void do_exit(long code)
  	if (tsk->binfmt)
  		module_put(tsk->binfmt->module);
@@ -59825,6 +59806,33 @@
  		mmdrop(mm);
  	}
  }
+@@ -493,16 +529,18 @@ void mm_release(struct task_struct *tsk,
+ 
+ 	/* Get rid of any futexes when releasing the mm */
+ #ifdef CONFIG_FUTEX
+-	if (unlikely(tsk->robust_list)) {
+-		exit_robust_list(tsk);
+-		tsk->robust_list = NULL;
+-	}
++ 	if (!(tsk->flags & PF_EXIT_RESTART)) {
++		if (unlikely(tsk->robust_list)) {
++			exit_robust_list(tsk);
++			tsk->robust_list = NULL;
++		}
+ #ifdef CONFIG_COMPAT
+-	if (unlikely(tsk->compat_robust_list)) {
+-		compat_exit_robust_list(tsk);
+-		tsk->compat_robust_list = NULL;
+-	}
++		if (unlikely(tsk->compat_robust_list)) {
++			compat_exit_robust_list(tsk);
++			tsk->compat_robust_list = NULL;
++		}
+ #endif
++	}
+ #endif
+ 
+ 	/* Get rid of any cached register state */
 @@ -568,6 +604,7 @@ fail_nocontext:
  	 * because it calls destroy_context()
  	 */