diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-08-22 14:42:36 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-08-22 14:42:36 -0400 |
| commit | 69758820a42da207bdc775d6eccf1f9fb67cd62e (patch) | |
| tree | 4c4dd2b596aa5535231656bf0fa1bc65a8b17471 /include/linux/mm.h | |
| parent | 113b898e38cb20e80847c24154ce62273b948c6a (diff) | |
| parent | ef7d1b244fa6c94fb76d5f787b8629df64ea4046 (diff) | |
Merge branch 'from-linus' into upstream
Diffstat (limited to 'include/linux/mm.h')
| -rw-r--r-- | include/linux/mm.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/mm.h b/include/linux/mm.h index 990957e0929f..f0b135cd86da 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h | |||
| @@ -336,6 +336,7 @@ static inline void init_page_count(struct page *page) | |||
| 336 | } | 336 | } |
| 337 | 337 | ||
| 338 | void put_page(struct page *page); | 338 | void put_page(struct page *page); |
| 339 | void put_pages_list(struct list_head *pages); | ||
| 339 | 340 | ||
| 340 | void split_page(struct page *page, unsigned int order); | 341 | void split_page(struct page *page, unsigned int order); |
| 341 | 342 | ||