[kernel] r18004 - dists/squeeze-security/linux-2.6/debian/patches/bugfix/all

[Dann Frazier]

Author: dannf
Date: Thu Aug 25 04:51:49 2011
New Revision: 18004

Log:
remove unintentionally added call to perf_event_mmap()

Modified:
   dists/squeeze-security/linux-2.6/debian/patches/bugfix/all/vm-fix-vm_pgoff-wrap-in-upward-expansion.patch

Modified: dists/squeeze-security/linux-2.6/debian/patches/bugfix/all/vm-fix-vm_pgoff-wrap-in-upward-expansion.patch
==============================================================================
--- dists/squeeze-security/linux-2.6/debian/patches/bugfix/all/vm-fix-vm_pgoff-wrap-in-upward-expansion.patch	Thu Aug 25 04:13:41 2011	(r18003)
+++ dists/squeeze-security/linux-2.6/debian/patches/bugfix/all/vm-fix-vm_pgoff-wrap-in-upward-expansion.patch	Thu Aug 25 04:51:49 2011	(r18004)
@@ -16,11 +16,10 @@
     Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
     [dannf: backported to Debian's 2.6.32]
 
-diff --git a/mm/mmap.c b/mm/mmap.c
-index 537b365..515e3cb 100644
---- a/mm/mmap.c
-+++ b/mm/mmap.c
-@@ -1636,9 +1636,14 @@ int expand_upwards(struct vm_area_struct *vma, unsigned long address)
+diff -urpN a/mm/mmap.c b/mm/mmap.c
+--- a/mm/mmap.c	2011-08-24 22:41:35.414475071 -0600
++++ b/mm/mmap.c	2011-08-24 22:43:55.639860464 -0600
+@@ -1636,9 +1636,12 @@ int expand_upwards(struct vm_area_struct
  		size = address - vma->vm_start;
  		grow = (address - vma->vm_end) >> PAGE_SHIFT;
  
@@ -30,10 +29,8 @@
 +		error = -ENOMEM;
 +		if (vma->vm_pgoff + (size >> PAGE_SHIFT) >= vma->vm_pgoff) {
 +			error = acct_stack_growth(vma, size, grow);
-+			if (!error) {
++			if (!error)
 +				vma->vm_end = address;
-+				perf_event_mmap(vma);
-+			}
 +		}
  	}
  	anon_vma_unlock(vma);