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

[Simon Horman]

Author: horms
Date: 2005-10-11 04:08:54 +0000 (Tue, 11 Oct 2005)
New Revision: 4393

Modified:
   dists/sid/linux-2.6/debian/patches-debian/fix-MPOL_F_VERIFY.patch
Log:
2.6.12 backport, not 2.6.8 backport

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-11 03:57:33 UTC (rev 4392)
+++ dists/sid/linux-2.6/debian/patches-debian/fix-MPOL_F_VERIFY.patch	2005-10-11 04:08:54 UTC (rev 4393)
@@ -18,27 +18,22 @@
  1 files changed, 6 insertions(+), 1 deletion(-)
 
 Backported to use verify_pages() instead of check_pgd_range()
-for Debian's 2.6.8
+for Debian's 2.6.12
 
---- from-0001/mm/mempolicy.c
-+++ to-work/mm/mempolicy.c	2005-10-06 18:12:04.000000000 +0900
-@@ -279,10 +279,15 @@ check_range(struct mm_struct *mm, unsign
+--- a/mm/mempolicy.c	2005-10-11 13:00:55.000000000 +0900
++++ b/mm/mempolicy.c	2005-10-11 13:05:56.000000000 +0900
+@@ -299,8 +299,13 @@ 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)) {
--			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;
++			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;