aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
Diffstat (limited to 'mm')
-rw-r--r--mm/hugetlb.c2
-rw-r--r--mm/page_alloc.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 59a0059b39e2..3b7a20ea3808 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -1,6 +1,6 @@
1/* 1/*
2 * Generic hugetlb support. 2 * Generic hugetlb support.
3 * (C) William Irwin, April 2004 3 * (C) Nadia Yvette Chambers, April 2004
4 */ 4 */
5#include <linux/list.h> 5#include <linux/list.h>
6#include <linux/init.h> 6#include <linux/init.h>
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 5b74de6702e0..57806b7e118b 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -523,7 +523,7 @@ static inline int page_is_buddy(struct page *page, struct page *buddy,
523 * If a block is freed, and its buddy is also free, then this 523 * If a block is freed, and its buddy is also free, then this
524 * triggers coalescing into a block of larger size. 524 * triggers coalescing into a block of larger size.
525 * 525 *
526 * -- wli 526 * -- nyc
527 */ 527 */
528 528
529static inline void __free_one_page(struct page *page, 529static inline void __free_one_page(struct page *page,
@@ -780,7 +780,7 @@ void __init init_cma_reserved_pageblock(struct page *page)
780 * large block of memory acted on by a series of small allocations. 780 * large block of memory acted on by a series of small allocations.
781 * This behavior is a critical factor in sglist merging's success. 781 * This behavior is a critical factor in sglist merging's success.
782 * 782 *
783 * -- wli 783 * -- nyc
784 */ 784 */
785static inline void expand(struct zone *zone, struct page *page, 785static inline void expand(struct zone *zone, struct page *page,
786 int low, int high, struct free_area *area, 786 int low, int high, struct free_area *area,