diff options
| author | Nicholas Bellinger <nab@linux-iscsi.org> | 2011-01-16 16:21:04 -0500 |
|---|---|---|
| committer | Nicholas Bellinger <nab@linux-iscsi.org> | 2011-01-16 16:21:04 -0500 |
| commit | f652f6c5b7cfdf139f4155d78f397e99ae1c4acc (patch) | |
| tree | 71c6344688bf56ea6aaf18c586ab69ff4f077ade /include/linux/swap.h | |
| parent | 140e3008e7fe1526cbb12f8f07dbc273ac713b75 (diff) | |
| parent | c66ac9db8d4ad9994a02b3e933ea2ccc643e1fe5 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/jejb/scsi-post-merge-2.6 into for-linus
Diffstat (limited to 'include/linux/swap.h')
| -rw-r--r-- | include/linux/swap.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/swap.h b/include/linux/swap.h index eba53e71d2cc..4d559325d919 100644 --- a/include/linux/swap.h +++ b/include/linux/swap.h | |||
| @@ -208,6 +208,8 @@ extern unsigned int nr_free_pagecache_pages(void); | |||
| 208 | /* linux/mm/swap.c */ | 208 | /* linux/mm/swap.c */ |
| 209 | extern void __lru_cache_add(struct page *, enum lru_list lru); | 209 | extern void __lru_cache_add(struct page *, enum lru_list lru); |
| 210 | extern void lru_cache_add_lru(struct page *, enum lru_list lru); | 210 | extern void lru_cache_add_lru(struct page *, enum lru_list lru); |
| 211 | extern void lru_add_page_tail(struct zone* zone, | ||
| 212 | struct page *page, struct page *page_tail); | ||
| 211 | extern void activate_page(struct page *); | 213 | extern void activate_page(struct page *); |
| 212 | extern void mark_page_accessed(struct page *); | 214 | extern void mark_page_accessed(struct page *); |
| 213 | extern void lru_add_drain(void); | 215 | extern void lru_add_drain(void); |
