r2288 - trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches

[Andres Salomon]

Author: dilinger-guest
Date: 2005-01-13 08:37:34 +0100 (Thu, 13 Jan 2005)
New Revision: 2288

Modified:
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/033-rlimit_memlock_check.dpatch
Log:
make it apply, and rediff


Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/033-rlimit_memlock_check.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/033-rlimit_memlock_check.dpatch	2005-01-13 07:31:35 UTC (rev 2287)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/033-rlimit_memlock_check.dpatch	2005-01-13 07:37:34 UTC (rev 2288)
@@ -40,7 +40,7 @@
 diff -Nru a/mm/mmap.c b/mm/mmap.c
 --- a/mm/mmap.c	2005-01-12 20:21:10 -08:00
 +++ b/mm/mmap.c	2005-01-12 20:21:10 -08:00
-@@ -1335,13 +1335,58 @@
+@@ -1335,13 +1335,57 @@
  	return prev ? prev->vm_next : vma;
  }
  
@@ -84,7 +84,6 @@
 +	mm->total_vm += grow;
 +	if (vma->vm_flags & VM_LOCKED)
 +		mm->locked_vm += grow;
-+	__vm_stat_account(mm, vma->vm_flags, vma->vm_file, grow);
 +	return 0;
 +}
 +
@@ -100,7 +99,7 @@
  
  	if (!(vma->vm_flags & VM_GROWSUP))
  		return -EFAULT;
-@@ -1361,28 +1406,14 @@
+@@ -1361,27 +1405,14 @@
  	 */
  	address += 4 + PAGE_SIZE - 1;
  	address &= PAGE_MASK;
@@ -124,7 +123,6 @@
 -	vma->vm_mm->total_vm += grow;
 -	if (vma->vm_flags & VM_LOCKED)
 -		vma->vm_mm->locked_vm += grow;
--	__vm_stat_account(vma->vm_mm, vma->vm_flags, vma->vm_file, grow);
 +	error = acct_stack_growth(vma, size, grow);
 +	if (!error)
 +		vma->vm_end = address;
@@ -144,7 +142,7 @@
  
  	/*
  	 * We must make sure the anon_vma is allocated
-@@ -1425,29 +1457,16 @@
+@@ -1425,28 +1457,16 @@
  	 * anon_vma lock to serialize against concurrent expand_stacks.
  	 */
  	address &= PAGE_MASK;
@@ -173,7 +171,6 @@
 -	vma->vm_mm->total_vm += grow;
 -	if (vma->vm_flags & VM_LOCKED)
 -		vma->vm_mm->locked_vm += grow;
--	__vm_stat_account(vma->vm_mm, vma->vm_flags, vma->vm_file, grow);
  	anon_vma_unlock(vma);
 -	return 0;
 +	return error;