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

[Dann Frazier]

Author: dannf
Date: Sat Aug 14 01:47:56 2010
New Revision: 16143

Log:
Adjust openvz patch to apply above mm-pass-correct-mm-when-growing-stack.patch

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	Sat Aug 14 01:47:50 2010	(r16142)
+++ dists/lenny-security/linux-2.6/debian/patches/features/all/openvz/openvz.patch	Sat Aug 14 01:47:56 2010	(r16143)
@@ -67515,7 +67515,7 @@
  	if (charged)
  		vm_unacct_memory(charged);
  	return error;
-@@ -1554,12 +1596,16 @@ static int acct_stack_growth(struct vm_area_struct * vma, unsigned long size, un
+@@ -1559,12 +1601,16 @@ static int acct_stack_growth(struct vm_a
  	if (is_hugepage_only_range(vma->vm_mm, new_start, size))
  		return -EFAULT;
  
@@ -67527,7 +67527,7 @@
  	 * Overcommit..  This must be the final test, as it will
  	 * update security statistics.
  	 */
- 	if (security_vm_enough_memory(grow))
+ 	if (security_vm_enough_memory_mm(mm, grow))
 -		return -ENOMEM;
 +		goto fail_sec;