r4348 - dists/sid/linux-2.6/debian/patches-debian

[Simon Horman]

Author: horms
Date: 2005-10-07 10:14:00 +0000 (Fri, 07 Oct 2005)
New Revision: 4348

Modified:
   dists/sid/linux-2.6/debian/patches-debian/fix-MPOL_F_VERIFY.patch
Log:
updated backport for 2.6.8

Modified: dists/sid/linux-2.6/debian/patches-debian/fix-MPOL_F_VERIFY.patch
===================================================================
--- dists/sid/linux-2.6/debian/patches-debian/fix-MPOL_F_VERIFY.patch	2005-10-07 10:07:50 UTC (rev 4347)
+++ dists/sid/linux-2.6/debian/patches-debian/fix-MPOL_F_VERIFY.patch	2005-10-07 10:14:00 UTC (rev 4348)
@@ -18,24 +18,27 @@
  1 files changed, 6 insertions(+), 1 deletion(-)
 
 Backported to use verify_pages() instead of check_pgd_range()
-for Debian's 2.6.12
+for Debian's 2.6.8
 
-Index: linux-2.6.13.y/mm/mempolicy.c
-===================================================================
 --- from-0001/mm/mempolicy.c
-+++ to-work/mm/mempolicy.c	2005-09-20 18:54:22.000000000 +0900
-@@ -299,8 +299,13 @@ check_range(struct mm_struct *mm, unsign
++++ to-work/mm/mempolicy.c	2005-10-06 18:12:04.000000000 +0900
+@@ -279,10 +279,15 @@ check_range(struct mm_struct *mm, unsign
  		if (prev && prev->vm_end < vma->vm_start)
  			return ERR_PTR(-EFAULT);
  		if ((flags & MPOL_MF_STRICT) && !is_vm_hugetlb_page(vma)) {
-+			unsigned long endvma = vma->vm_end; 
-+			if (endvma > end)
-+				endvma = end;
-+			if (vma->vm_start > start)
-+				start = vma->vm_start;
- 			err = verify_pages(vma->vm_mm,
--					   vma->vm_start, vma->vm_end, nodes);
-+					   start, endvma, nodes);
- 			if (err) {
- 				first = ERR_PTR(err);
- 				break;
+-			err = verify_pages(vma->vm_start, vma->vm_end, nodes);
+-			if (err) {
+-				first = ERR_PTR(err);
+-				break;
++ 			unsigned long endvma = vma->vm_end; 
++ 			if (endvma > end)
++ 				endvma = end;
++ 			if (vma->vm_start > start)
++ 				start = vma->vm_start;
++  			err = verify_pages(start, endvma, nodes);
++  			if (err) {
++  				first = ERR_PTR(err);
++  				break;
+ 			}
+ 		}
+ 		prev = vma;