diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-30 01:58:18 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-30 01:58:18 -0500 |
| commit | f0612bbc41f65f5a684f69d714a1a17a6f0f40c5 (patch) | |
| tree | 8c070070bb355843cfa4635643e9da7c2c4cd44a /include/linux/rmap.h | |
| parent | b0c4e148bd591629749d02a8fbc8d81c26d548cf (diff) | |
| parent | 81cfb8864c73230eb1c37753aba517db15cf4d8f (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'include/linux/rmap.h')
| -rw-r--r-- | include/linux/rmap.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/rmap.h b/include/linux/rmap.h index e80fb7ee6efd..35b30e6c8cf8 100644 --- a/include/linux/rmap.h +++ b/include/linux/rmap.h | |||
| @@ -95,8 +95,8 @@ int try_to_unmap(struct page *); | |||
| 95 | /* | 95 | /* |
| 96 | * Called from mm/filemap_xip.c to unmap empty zero page | 96 | * Called from mm/filemap_xip.c to unmap empty zero page |
| 97 | */ | 97 | */ |
| 98 | pte_t *page_check_address(struct page *, struct mm_struct *, unsigned long); | 98 | pte_t *page_check_address(struct page *, struct mm_struct *, |
| 99 | 99 | unsigned long, spinlock_t **); | |
| 100 | 100 | ||
| 101 | /* | 101 | /* |
| 102 | * Used by swapoff to help locate where page is expected in vma. | 102 | * Used by swapoff to help locate where page is expected in vma. |