1 files changed, 12 insertions, 5 deletions

diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c
index 74a702674e86..0eb572eda406 100644
--- a/arch/x86/mm/pat.c
+++ b/arch/x86/mm/pat.c
@@ -677,7 +677,7 @@ int track_pfn_copy(struct vm_area_struct *vma)
         unsigned long vma_size = vma->vm_end - vma->vm_start;
         pgprot_t pgprot;
 
-        if (is_linear_pfn_mapping(vma)) {
+        if (vma->vm_flags & VM_PAT) {
                 /*
                  * reserve the whole chunk covered by vma. We need the
                  * starting address and protection from pte.
@@ -699,14 +699,20 @@ int track_pfn_copy(struct vm_area_struct *vma)
  * single reserve_pfn_range call.
  */
 int track_pfn_remap(struct vm_area_struct *vma, pgprot_t *prot,
-                    unsigned long pfn, unsigned long size)
+                    unsigned long pfn, unsigned long addr, unsigned long size)
 {
         resource_size_t paddr = (resource_size_t)pfn << PAGE_SHIFT;
         unsigned long flags;
 
         /* reserve the whole chunk starting from paddr */
-        if (is_linear_pfn_mapping(vma))
-                return reserve_pfn_range(paddr, size, prot, 0);
+        if (addr == vma->vm_start && size == (vma->vm_end - vma->vm_start)) {
+                int ret;
+
+                ret = reserve_pfn_range(paddr, size, prot, 0);
+                if (!ret)
+                        vma->vm_flags |= VM_PAT;
+                return ret;
+        }
 
         if (!pat_enabled)
                 return 0;
@@ -758,7 +764,7 @@ void untrack_pfn(struct vm_area_struct *vma, unsigned long pfn,
         resource_size_t paddr;
         unsigned long prot;
 
-        if (!is_linear_pfn_mapping(vma))
+        if (!(vma->vm_flags & VM_PAT))
                 return;
 
         /* free the chunk starting from pfn or the whole chunk */
@@ -772,6 +778,7 @@ void untrack_pfn(struct vm_area_struct *vma, unsigned long pfn,
                 size = vma->vm_end - vma->vm_start;
         }
         free_pfn_range(paddr, size);
+        vma->vm_flags &= ~VM_PAT;
 }
 
 pgprot_t pgprot_writecombine(pgprot_t prot)