diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-10 18:11:43 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-10 18:11:43 -0700 |
commit | db6e330490e448733e7836833e25e96034770058 (patch) | |
tree | ee23fbe6831bbd757328b3d80b4faa6651b2c314 /mm/nommu.c | |
parent | ae9249493049fd41fa52fc0470251ee1efaabe74 (diff) | |
parent | 98d1e64f95b177d0f14efbdf695a1b28e1428035 (diff) |
Merge branch 'akpm' (patches from Andrew Morton)
Merge more patches from Andrew Morton:
"The rest of MM"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
mm: remove free_area_cache
zswap: add documentation
zswap: add to mm/
zbud: add to mm/
Diffstat (limited to 'mm/nommu.c')
-rw-r--r-- | mm/nommu.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/mm/nommu.c b/mm/nommu.c index e44e6e0a125..ecd1f158548 100644 --- a/mm/nommu.c +++ b/mm/nommu.c @@ -1871,10 +1871,6 @@ unsigned long arch_get_unmapped_area(struct file *file, unsigned long addr, return -ENOMEM; } -void arch_unmap_area(struct mm_struct *mm, unsigned long addr) -{ -} - void unmap_mapping_range(struct address_space *mapping, loff_t const holebegin, loff_t const holelen, int even_cows) |