[patch 1/6] x86 PAT: remove PFNMAP type on track_pfn_vma_new() error

[venkatesh.pallipadi@intel.com]

[-- Attachment #1: pfn_cleaup_fix_02.patch --]
[-- Type: text/plain, Size: 1293 bytes --]

On track_pfn_vma_new() failure, reset the vm_flags so that there will be
no second cleanup happening when upper level routines call unmap_vmas().

This patch fixes part of the bug reported here
http://marc.info/?l=linux-kernel&m=123108883716357&w=2

Specifically the error message
X:5010 freeing invalid memtype d0000000-d0101000
Is due to multiple frees on error path, will not happen with the patch below.

Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com>

---
 mm/memory.c |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

Index: tip/mm/memory.c
===================================================================
--- tip.orig/mm/memory.c	2009-01-06 11:14:35.000000000 -0800
+++ tip/mm/memory.c	2009-01-06 13:44:57.000000000 -0800
@@ -1605,8 +1605,14 @@ int remap_pfn_range(struct vm_area_struc
 	vma->vm_flags |= VM_IO | VM_RESERVED | VM_PFNMAP;
 
 	err = track_pfn_vma_new(vma, prot, pfn, PAGE_ALIGN(size));
-	if (err)
+	if (err) {
+		/*
+		 * To indicate that track_pfn related cleanup is not
+		 * needed from higher level routine calling unmap_vmas
+		 */
+		vma->vm_flags &= ~(VM_IO | VM_RESERVED | VM_PFNMAP);
 		return -EINVAL;
+	}
 
 	BUG_ON(addr >= end);
 	pfn -= addr >> PAGE_SHIFT;

--