Commit e651309a authored by David Rientjes's avatar David Rientjes Committed by james toy

On Thu, 8 Oct 2009, Lee Schermerhorn wrote:

> @@ -1144,14 +1156,15 @@ static void __init report_hugepages(void
>  }
>
>  #ifdef CONFIG_HIGHMEM
> -static void try_to_free_low(struct hstate *h, unsigned long count)
> +static void try_to_free_low(struct hstate *h, unsigned long count,
> +						nodemask_t *nodes_allowed)
>  {
>  	int i;
>
>  	if (h->order >= MAX_ORDER)
>  		return;
>
> -	for (i = 0; i < MAX_NUMNODES; ++i) {
> +	for_each_node_mask(node, nodes_allowed_) {
>  		struct page *page, *next;
>  		struct list_head *freel = &h->hugepage_freelists[i];
>  		list_for_each_entry_safe(page, next, freel, lru) {

That's not looking good for i386, Andrew please fold the following into
this patch when it's merged into -mm:

[rientjes@google.com: fix HIGHMEM compile error]
Signed-off-by: default avatarDavid Rientjes <rientjes@google.com>
Cc: Lee Schermerhorn <lee.schermerhorn@hp.com>
Cc: Mel Gorman <mel@csn.ul.ie>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Nishanth Aravamudan <nacc@us.ibm.com>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: Adam Litke <agl@us.ibm.com>
Cc: Andy Whitcroft <apw@canonical.com>
Cc: Eric Whitney <eric.whitney@hp.com>
Cc: Christoph Lameter <cl@linux-foundation.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent d1945f93
...@@ -1164,7 +1164,7 @@ static void try_to_free_low(struct hstate *h, unsigned long count, ...@@ -1164,7 +1164,7 @@ static void try_to_free_low(struct hstate *h, unsigned long count,
if (h->order >= MAX_ORDER) if (h->order >= MAX_ORDER)
return; return;
for_each_node_mask(node, nodes_allowed_) { for_each_node_mask(i, *nodes_allowed) {
struct page *page, *next; struct page *page, *next;
struct list_head *freel = &h->hugepage_freelists[i]; struct list_head *freel = &h->hugepage_freelists[i];
list_for_each_entry_safe(page, next, freel, lru) { list_for_each_entry_safe(page, next, freel, lru) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment