diff options
| author | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 20:29:58 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 20:29:58 -0800 |
| commit | 22a160fb095ca694e9f7ee29f131382e1faec889 (patch) | |
| tree | a9df773ad9c22327533fc5937546937a33fbee76 /include | |
| parent | f97f22cb0b9dca2a797feccc580b3b8fdb238ac3 (diff) | |
v2.4.13.4 -> v2.4.13.5
- Andrew Morton: remove stale UnlockPage
- me: swap cache page locking update
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mm.h | 15 | ||||
| -rw-r--r-- | include/linux/pagemap.h | 2 |
2 files changed, 2 insertions, 15 deletions
diff --git a/include/linux/mm.h b/include/linux/mm.h index 6cbd7ed4c464..f865aafd1445 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -466,20 +466,7 @@ static inline int is_page_cache_freeable(struct page * page) return page_count(page) - !!page->buffers == 1; } -/* - * Work out if there are any other processes sharing this - * swap cache page. Never mind the buffers. - */ -static inline int exclusive_swap_page(struct page *page) -{ - if (!PageLocked(page)) - BUG(); - if (!PageSwapCache(page)) - return 0; - if (page_count(page) - !!page->buffers != 2) /* 2: us + cache */ - return 0; - return swap_count(page) == 1; /* 1: just cache */ -} +extern int remove_exclusive_swap_page(struct page *); extern void __free_pte(pte_t); diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index 1fda6fa35b24..5da8ca6af63b 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h @@ -29,7 +29,7 @@ #define PAGE_CACHE_ALIGN(addr) (((addr)+PAGE_CACHE_SIZE-1)&PAGE_CACHE_MASK) #define page_cache_get(x) get_page(x) -#define page_cache_release(x) __free_page(x) +#define page_cache_release(x) free_lru_page(x) static inline struct page *page_cache_alloc(struct address_space *x) { |