diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-09-01 14:32:13 +0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-09-01 14:32:13 +0400 |
| commit | 9d7548d4ca3c52ecb58f098a32b0756cdf8f96ee (patch) | |
| tree | 651f7058bbaa2d8b2855286380d614afcf505118 /include/linux/rmap.h | |
| parent | 31db6e9ea1dbdcf66b8227b4f7035dee1b1dd8c0 (diff) | |
| parent | bef69ea0dcce574a425feb0a5aa4c63dd108b9a6 (diff) | |
| download | linux-9d7548d4ca3c52ecb58f098a32b0756cdf8f96ee.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/linux/rmap.h')
| -rw-r--r-- | include/linux/rmap.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/rmap.h b/include/linux/rmap.h index 69407f85e10b..fed6f5e0b411 100644 --- a/include/linux/rmap.h +++ b/include/linux/rmap.h @@ -102,7 +102,7 @@ int try_to_unmap(struct page *, int ignore_refs); * Called from mm/filemap_xip.c to unmap empty zero page */ pte_t *page_check_address(struct page *, struct mm_struct *, - unsigned long, spinlock_t **); + unsigned long, spinlock_t **, int); /* * Used by swapoff to help locate where page is expected in vma. |