summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-05-21 08:37:07 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-05-21 08:37:07 -0700
commitdddbd5414bee86d14bbc835163ca72e4e457c80a (patch)
tree97f2fc5fcfb543ffc1fa7d301f2e41a37e5e12f2 /include/linux
parent76e10d158efb6d4516018846f60c2ab5501900bc (diff)
parent4f74d2c8e827af12596f153a564c868bf6dbe3dd (diff)
downloadlinux-3.10-dddbd5414bee86d14bbc835163ca72e4e457c80a.tar.gz
linux-3.10-dddbd5414bee86d14bbc835163ca72e4e457c80a.tar.bz2
linux-3.10-dddbd5414bee86d14bbc835163ca72e4e457c80a.zip
Merge branch 'vm-cleanups' (unmap_vma() interface cleanup)
This series sanitizes the interface to unmap_vma(). The crazy interface annoyed me no end when I was looking at unmap_single_vma(), which we can spend quite a lot of time in (especially with loads that have a lot of small fork/exec's: shell scripts etc). Moving the nr_accounted calculations to where they belong at least clarifies things a little. I hope to come back to look at the performance of this later, but if/when I get back to it I at least don't have to see the crazy interfaces any more. * vm-cleanups: vm: remove 'nr_accounted' calculations from the unmap_vmas() interfaces vm: simplify unmap_vmas() calling convention
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/mm.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/include/linux/mm.h b/include/linux/mm.h
index 74aa71bea1e..7d5c37f24c6 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -896,10 +896,8 @@ int zap_vma_ptes(struct vm_area_struct *vma, unsigned long address,
unsigned long size);
void zap_page_range(struct vm_area_struct *vma, unsigned long address,
unsigned long size, struct zap_details *);
-void unmap_vmas(struct mmu_gather *tlb,
- struct vm_area_struct *start_vma, unsigned long start_addr,
- unsigned long end_addr, unsigned long *nr_accounted,
- struct zap_details *);
+void unmap_vmas(struct mmu_gather *tlb, struct vm_area_struct *start_vma,
+ unsigned long start, unsigned long end);
/**
* mm_walk - callbacks for walk_page_range