rpms/kernel/devel linux-2.6-vm-lrmi-unbreak.patch, NONE, 1.1 kernel-2.6.spec, 1.1675, 1.1676

[fedora-cvs-commits at redhat.com]

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17920

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-vm-lrmi-unbreak.patch 
Log Message:
Make lrmi using apps (ddcprobe et al) work again.


linux-2.6-vm-lrmi-unbreak.patch:
 memory.c   |    2 +-
 mmap.c     |   11 -----------
 mprotect.c |    8 --------
 3 files changed, 1 insertion(+), 20 deletions(-)

--- NEW FILE linux-2.6-vm-lrmi-unbreak.patch ---

Make lrmi & friends happy again.

--- 2.6.15-rc1-git2/mm/memory.c	2005-11-14 12:01:10.000000000 +0000
+++ linux/mm/memory.c	2005-11-14 19:42:05.000000000 +0000
@@ -968,7 +968,7 @@ int get_user_pages(struct task_struct *t
 			continue;
 		}
 
-		if (!vma || (vma->vm_flags & (VM_IO | VM_RESERVED))
+		if (!vma || (vma->vm_flags & VM_IO)
 				|| !(vm_flags & vma->vm_flags))
 			return i ? : -EFAULT;
 
--- 2.6.15-rc1-git2/mm/mmap.c	2005-11-12 09:01:25.000000000 +0000
+++ linux/mm/mmap.c	2005-11-14 19:44:45.000000000 +0000
@@ -1076,17 +1076,6 @@ munmap_back:
 		error = file->f_op->mmap(file, vma);
 		if (error)
 			goto unmap_and_free_vma;
-		if ((vma->vm_flags & (VM_SHARED | VM_WRITE | VM_RESERVED))
-						== (VM_WRITE | VM_RESERVED)) {
-			printk(KERN_WARNING "program %s is using MAP_PRIVATE, "
-				"PROT_WRITE mmap of VM_RESERVED memory, which "
-				"is deprecated. Please report this to "
-				"linux-kernel at vger.kernel.org\n",current->comm);
-			if (vma->vm_ops && vma->vm_ops->close)
-				vma->vm_ops->close(vma);
-			error = -EACCES;
-			goto unmap_and_free_vma;
-		}
 	} else if (vm_flags & VM_SHARED) {
 		error = shmem_zero_setup(vma);
 		if (error)
--- 2.6.15-rc1-git2/mm/mprotect.c	2005-11-12 09:01:25.000000000 +0000
+++ linux/mm/mprotect.c	2005-11-14 19:45:56.000000000 +0000
@@ -124,14 +124,6 @@ mprotect_fixup(struct vm_area_struct *vm
 	 * a MAP_NORESERVE private mapping to writable will now reserve.
 	 */
 	if (newflags & VM_WRITE) {
-		if (oldflags & VM_RESERVED) {
-			BUG_ON(oldflags & VM_WRITE);
-			printk(KERN_WARNING "program %s is using MAP_PRIVATE, "
-				"PROT_WRITE mprotect of VM_RESERVED memory, "
-				"which is deprecated. Please report this to "
-				"linux-kernel at vger.kernel.org\n",current->comm);
-			return -EACCES;
-		}
 		if (!(oldflags & (VM_ACCOUNT|VM_WRITE|VM_SHARED|VM_HUGETLB))) {
 			charged = nrpages;
 			if (security_vm_enough_memory(charged))



Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.1675
retrieving revision 1.1676
diff -u -r1.1675 -r1.1676
--- kernel-2.6.spec	15 Nov 2005 17:23:57 -0000	1.1675
+++ kernel-2.6.spec	15 Nov 2005 17:28:17 -0000	1.1676
@@ -347,6 +347,7 @@
 # VM bits.
 Patch2000: linux-2.6-vm-oomkiller-debugging.patch
 Patch2001: linux-2.6-vm-silence-atomic-alloc-failures.patch
+Patch2002: linux-2.6-vm-lrmi-unbreak.patch
 
 
 #
@@ -798,6 +799,8 @@
 %patch2000 -p1
 # Silence GFP_ATOMIC failures.
 %patch2001 -p1
+# Make lrmi work again.
+%patch2002 -p1
 
 #
 # Patches 5000 to 6000 are reserved for new drivers that are about to
@@ -1294,6 +1297,7 @@
 %changelog
 * Tue Nov 15 2005 Dave Jones <davej at redhat.com>
 - 2.6.15-rc1-git3
+- Make lrmi using apps (ddcprobe et al) work again.
 
 * Tue Nov 15 2005 David Woodhouse <dwmw2 at redhat.com>
 - More PPC vDSO fixes