diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-01-28 19:33:37 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-01-28 19:33:37 -0500 |
| commit | dfd0436ad0ce139467b124c646fa65ee2635e14a (patch) | |
| tree | abf9d83c704417cdd484243c12aeffee6b185aba /include/linux/mm.h | |
| parent | b9818c3312da66f4b83a4a2e8650628be1237cb5 (diff) | |
| parent | 689dfa894c57842a05bf6dc9f97e6bb71ec5f386 (diff) | |
Merge branch 'merge' into next
Merge "merge" branch to bring in various bug fixes that are
going into 3.8
Diffstat (limited to 'include/linux/mm.h')
| -rw-r--r-- | include/linux/mm.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/mm.h b/include/linux/mm.h index 63204078f72b..66e2f7c61e5c 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h | |||
| @@ -455,7 +455,6 @@ void put_pages_list(struct list_head *pages); | |||
| 455 | 455 | ||
| 456 | void split_page(struct page *page, unsigned int order); | 456 | void split_page(struct page *page, unsigned int order); |
| 457 | int split_free_page(struct page *page); | 457 | int split_free_page(struct page *page); |
| 458 | int capture_free_page(struct page *page, int alloc_order, int migratetype); | ||
| 459 | 458 | ||
| 460 | /* | 459 | /* |
| 461 | * Compound pages have a destructor function. Provide a | 460 | * Compound pages have a destructor function. Provide a |