From: Andrew Morton <akpm@linux-foundation.org>

Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Lee Schermerhorn <lee.schermerhorn@hp.com>
Cc: Christoph Lameter <clameter@sgi.com>
Cc: Andi Kleen <ak@suse.de>
Cc: "jesse.barnes@intel.com" <jesse.barnes@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 mm/page_alloc.c |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff -puN mm/page_alloc.c~change-zonelist-order-v6-zonelist-fix mm/page_alloc.c
--- a/mm/page_alloc.c~change-zonelist-order-v6-zonelist-fix
+++ a/mm/page_alloc.c
@@ -1811,8 +1811,8 @@ static void build_zonelists_in_node_orde
 
 	for (i = 0; i < MAX_NR_ZONES; i++) {
 		zonelist = pgdat->node_zonelists + i;
-		for (j = 0; zonelist->zones[j] != NULL; j++);
-
+		for (j = 0; zonelist->zones[j] != NULL; j++)
+			;
  		j = build_zonelists_node(NODE_DATA(node), zonelist, j, i);
 		zonelist->zones[j] = NULL;
 	}
@@ -1865,8 +1865,6 @@ static void set_zonelist_order(void)
 		current_zonelist_order = user_zonelist_order;
 }
 
-
-
 static void build_zonelists(pg_data_t *pgdat)
 {
 	int j, node, load;
_