diff options
Diffstat (limited to 'mm/page_alloc.c')
| -rw-r--r-- | mm/page_alloc.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 97d6827c7d66..ea77c999047e 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c | |||
| @@ -232,11 +232,13 @@ static inline void prep_zero_page(struct page *page, int order, gfp_t gfp_flags) | |||
| 232 | * zone->lock is already acquired when we use these. | 232 | * zone->lock is already acquired when we use these. |
| 233 | * So, we don't need atomic page->flags operations here. | 233 | * So, we don't need atomic page->flags operations here. |
| 234 | */ | 234 | */ |
| 235 | static inline unsigned long page_order(struct page *page) { | 235 | static inline unsigned long page_order(struct page *page) |
| 236 | { | ||
| 236 | return page_private(page); | 237 | return page_private(page); |
| 237 | } | 238 | } |
| 238 | 239 | ||
| 239 | static inline void set_page_order(struct page *page, int order) { | 240 | static inline void set_page_order(struct page *page, int order) |
| 241 | { | ||
| 240 | set_page_private(page, order); | 242 | set_page_private(page, order); |
| 241 | __SetPageBuddy(page); | 243 | __SetPageBuddy(page); |
| 242 | } | 244 | } |
| @@ -299,9 +301,9 @@ static inline int page_is_buddy(struct page *page, int order) | |||
| 299 | 301 | ||
| 300 | if (PageBuddy(page) && page_order(page) == order) { | 302 | if (PageBuddy(page) && page_order(page) == order) { |
| 301 | BUG_ON(page_count(page) != 0); | 303 | BUG_ON(page_count(page) != 0); |
| 302 | return 1; | 304 | return 1; |
| 303 | } | 305 | } |
| 304 | return 0; | 306 | return 0; |
| 305 | } | 307 | } |
| 306 | 308 | ||
| 307 | /* | 309 | /* |
| @@ -1960,7 +1962,7 @@ static inline void free_zone_pagesets(int cpu) | |||
| 1960 | } | 1962 | } |
| 1961 | } | 1963 | } |
| 1962 | 1964 | ||
| 1963 | static int __cpuinit pageset_cpuup_callback(struct notifier_block *nfb, | 1965 | static int pageset_cpuup_callback(struct notifier_block *nfb, |
| 1964 | unsigned long action, | 1966 | unsigned long action, |
| 1965 | void *hcpu) | 1967 | void *hcpu) |
| 1966 | { | 1968 | { |
