diff options
| author | Javier Martinez Canillas <javier@dowhile0.org> | 2013-04-26 21:07:03 +0200 |
|---|---|---|
| committer | Javier Martinez Canillas <javier@dowhile0.org> | 2013-04-26 21:57:00 +0200 |
| commit | 290fa172d35194aebc42b0d7076942391bf9deef (patch) | |
| tree | 173489215633197e31ea9f33ab32be71bd3f718a | |
| parent | 4c90483ad066ae42ec9d86e2b250f7dc96f72dfd (diff) | |
| download | ldd3-290fa172d35194aebc42b0d7076942391bf9deef.tar.gz | |
ldd3: get rid of deprecated VM_RESERVED vma flag
commit 314e51b9 ("mm: kill vma flag VM_RESERVED and mm->reserved_vm counter")
removed the VM_RESERVED vma flag since it lost original meaning.
VM_RESERVED was used on many drivers' mmap function handler to
avoid swap this memory area.
The same semantic can be specified with VM_IO | VM_DONTDUMP flags
but these are already set by remap_pfn_range() so they don't have
to be set in drivers mmap function handlers.
Signed-off-by: Javier Martinez Canillas <javier@dowhile0.org>
| -rw-r--r-- | scullc/mmap.c | 1 | ||||
| -rw-r--r-- | sculld/mmap.c | 1 | ||||
| -rw-r--r-- | scullp/mmap.c | 1 | ||||
| -rw-r--r-- | scullv/mmap.c | 1 | ||||
| -rw-r--r-- | simple/simple.c | 6 |
5 files changed, 0 insertions, 10 deletions
diff --git a/scullc/mmap.c b/scullc/mmap.c index 1ba0698..4bf4094 100644 --- a/scullc/mmap.c +++ b/scullc/mmap.c @@ -109,7 +109,6 @@ int scullc_mmap(struct file *filp, struct vm_area_struct *vma) /* don't do anything here: "nopage" will set up page table entries */ vma->vm_ops = &scullc_vm_ops; - vma->vm_flags |= VM_RESERVED; vma->vm_private_data = filp->private_data; scullc_vma_open(vma); return 0; diff --git a/sculld/mmap.c b/sculld/mmap.c index 45a1274..8a9075c 100644 --- a/sculld/mmap.c +++ b/sculld/mmap.c @@ -110,7 +110,6 @@ int sculld_mmap(struct file *filp, struct vm_area_struct *vma) /* don't do anything here: "nopage" will set up page table entries */ vma->vm_ops = &sculld_vm_ops; - vma->vm_flags |= VM_RESERVED; vma->vm_private_data = filp->private_data; sculld_vma_open(vma); return 0; diff --git a/scullp/mmap.c b/scullp/mmap.c index 0616dcb..7623e9b 100644 --- a/scullp/mmap.c +++ b/scullp/mmap.c @@ -112,7 +112,6 @@ int scullp_mmap(struct file *filp, struct vm_area_struct *vma) /* don't do anything here: "nopage" will set up page table entries */ vma->vm_ops = &scullp_vm_ops; - vma->vm_flags |= VM_RESERVED; vma->vm_private_data = filp->private_data; scullp_vma_open(vma); return 0; diff --git a/scullv/mmap.c b/scullv/mmap.c index 4b6f48c..e934f41 100644 --- a/scullv/mmap.c +++ b/scullv/mmap.c @@ -113,7 +113,6 @@ int scullv_mmap(struct file *filp, struct vm_area_struct *vma) /* don't do anything here: "nopage" will set up page table entries */ vma->vm_ops = &scullv_vm_ops; - vma->vm_flags |= VM_RESERVED; vma->vm_private_data = filp->private_data; scullv_vma_open(vma); return 0; diff --git a/simple/simple.c b/simple/simple.c index c1f9438..f9bf602 100644 --- a/simple/simple.c +++ b/simple/simple.c @@ -120,12 +120,6 @@ static struct vm_operations_struct simple_nopage_vm_ops = { static int simple_nopage_mmap(struct file *filp, struct vm_area_struct *vma) { - unsigned long offset = vma->vm_pgoff << PAGE_SHIFT; - - if (offset >= __pa(high_memory) || (filp->f_flags & O_SYNC)) - vma->vm_flags |= VM_IO; - vma->vm_flags |= VM_RESERVED; - vma->vm_ops = &simple_nopage_vm_ops; simple_vma_open(vma); return 0; |