| From dhobsong@igel.co.jp Mon Oct 29 00:51:50 2012 |
| From: Damian Hobson-Garcia <dhobsong@igel.co.jp> |
| Date: Mon, 29 Oct 2012 16:50:18 +0900 |
| Subject: [PATCH v2 01/58] mm: page_alloc: remove trailing whitespace |
| To: greg@kroah.com, laurent.pinchart@ideasonboard.com, horms@verge.net.au |
| Cc: ltsi-dev@lists.linuxfoundation.org, dhobsong@igel.co.jp |
| Message-ID: <1351497075-32717-2-git-send-email-dhobsong@igel.co.jp> |
| |
| |
| From: Michal Nazarewicz <mina86@mina86.com> |
| |
| Signed-off-by: Michal Nazarewicz <mina86@mina86.com> |
| Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> |
| Acked-by: Mel Gorman <mel@csn.ul.ie> |
| (cherry picked from commit 5f63b720b62925ef3c6a85473dcd547b0fd90616) |
| |
| Signed-off-by: Damian Hobson-Garcia <dhobsong@igel.co.jp> |
| Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> |
| --- |
| mm/page_alloc.c | 14 +++++++------- |
| 1 file changed, 7 insertions(+), 7 deletions(-) |
| |
| --- a/mm/page_alloc.c |
| +++ b/mm/page_alloc.c |
| @@ -513,10 +513,10 @@ static inline int page_is_buddy(struct p |
| * free pages of length of (1 << order) and marked with _mapcount -2. Page's |
| * order is recorded in page_private(page) field. |
| * So when we are allocating or freeing one, we can derive the state of the |
| - * other. That is, if we allocate a small block, and both were |
| - * free, the remainder of the region must be split into blocks. |
| + * other. That is, if we allocate a small block, and both were |
| + * free, the remainder of the region must be split into blocks. |
| * If a block is freed, and its buddy is also free, then this |
| - * triggers coalescing into a block of larger size. |
| + * triggers coalescing into a block of larger size. |
| * |
| * -- wli |
| */ |
| @@ -1061,17 +1061,17 @@ retry_reserve: |
| return page; |
| } |
| |
| -/* |
| +/* |
| * Obtain a specified number of elements from the buddy allocator, all under |
| * a single hold of the lock, for efficiency. Add them to the supplied list. |
| * Returns the number of new pages which were placed at *list. |
| */ |
| -static int rmqueue_bulk(struct zone *zone, unsigned int order, |
| +static int rmqueue_bulk(struct zone *zone, unsigned int order, |
| unsigned long count, struct list_head *list, |
| int migratetype, int cold) |
| { |
| int i; |
| - |
| + |
| spin_lock(&zone->lock); |
| for (i = 0; i < count; ++i) { |
| struct page *page = __rmqueue(zone, order, migratetype); |
| @@ -4308,7 +4308,7 @@ static void __paginginit free_area_init_ |
| init_waitqueue_head(&pgdat->kswapd_wait); |
| pgdat->kswapd_max_order = 0; |
| pgdat_page_cgroup_init(pgdat); |
| - |
| + |
| for (j = 0; j < MAX_NR_ZONES; j++) { |
| struct zone *zone = pgdat->node_zones + j; |
| unsigned long size, realsize, memmap_pages; |