aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorPallipadi, Venkatesh <venkatesh.pallipadi@intel.com>2009-03-13 19:35:44 -0400
committerIngo Molnar <mingo@elte.hu>2009-03-14 04:47:44 -0400
commit895791dac6946d535991edd11341046f8e85ea77 (patch)
tree4ad589460b0d7c039f5d5a42666c6bd572255049 /mm
parent4bb9c5c02153dfc89a6c73a6f32091413805ad7d (diff)
VM, x86, PAT: add a new vm flag to track full pfnmap at mmap
Impact: cleanup Add a new vm flag VM_PFN_AT_MMAP to identify a PFNMAP that is fully mapped with remap_pfn_range. Patch removes the overloading of VM_INSERTPAGE from the earlier patch. Signed-off-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com> Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com> Acked-by: Nick Piggin <npiggin@suse.de> LKML-Reference: <20090313233543.GA19909@linux-os.sc.intel.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'mm')
-rw-r--r--mm/memory.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/memory.c b/mm/memory.c
index d7df5babcba9..2032ad2fc34b 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -1667,7 +1667,7 @@ int remap_pfn_range(struct vm_area_struct *vma, unsigned long addr,
1667 */ 1667 */
1668 if (addr == vma->vm_start && end == vma->vm_end) { 1668 if (addr == vma->vm_start && end == vma->vm_end) {
1669 vma->vm_pgoff = pfn; 1669 vma->vm_pgoff = pfn;
1670 vma->vm_flags |= VM_PFNMAP_AT_MMAP; 1670 vma->vm_flags |= VM_PFN_AT_MMAP;
1671 } else if (is_cow_mapping(vma->vm_flags)) 1671 } else if (is_cow_mapping(vma->vm_flags))
1672 return -EINVAL; 1672 return -EINVAL;
1673 1673
@@ -1680,7 +1680,7 @@ int remap_pfn_range(struct vm_area_struct *vma, unsigned long addr,
1680 * needed from higher level routine calling unmap_vmas 1680 * needed from higher level routine calling unmap_vmas
1681 */ 1681 */
1682 vma->vm_flags &= ~(VM_IO | VM_RESERVED | VM_PFNMAP); 1682 vma->vm_flags &= ~(VM_IO | VM_RESERVED | VM_PFNMAP);
1683 vma->vm_flags &= ~VM_PFNMAP_AT_MMAP; 1683 vma->vm_flags &= ~VM_PFN_AT_MMAP;
1684 return -EINVAL; 1684 return -EINVAL;
1685 } 1685 }
1686 1686