From 54cd8655ac5487dc289c22450b543d4604182076 Mon Sep 17 00:00:00 2001
From: Johannes Weiner <hannes@saeurebad.de>
Date: Wed, 23 Jul 2008 21:28:03 -0700
Subject: [PATCH] --- yaml --- r: 105327 b: refs/heads/master c:
 636cc40cb79f511d9caa27ef098a83e4fa4971fb h: refs/heads/master i:   105325:
 8ed15a3e2d5302af0d7e533bcce0a38882bd8629   105323:
 51a8e3ef728074811875ba07039a5ab5f605697c   105319:
 33710ffdf00661c935c1357b667806998c90f8e7   105311:
 97e2260a1ff33cd57f7a14198106986eaf9f3828 v: v3

---
 [refs]             |  2 +-
 trunk/mm/bootmem.c | 23 ++++++++++-------------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index f91ca768a415..008d5ec4d6cc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: df049a5f41a3b2eee2131221959e3b558ba7c705
+refs/heads/master: 636cc40cb79f511d9caa27ef098a83e4fa4971fb
diff --git a/trunk/mm/bootmem.c b/trunk/mm/bootmem.c
index 484849bfc8c4..9da7d4097810 100644
--- a/trunk/mm/bootmem.c
+++ b/trunk/mm/bootmem.c
@@ -23,7 +23,6 @@ unsigned long max_low_pfn;
 unsigned long min_low_pfn;
 unsigned long max_pfn;
 
-static LIST_HEAD(bdata_list);
 #ifdef CONFIG_CRASH_DUMP
 /*
  * If we have booted due to a crash, max_pfn will be a very low value. We need
@@ -34,6 +33,8 @@ unsigned long saved_max_pfn;
 
 bootmem_data_t bootmem_node_data[MAX_NUMNODES] __initdata;
 
+static struct list_head bdata_list __initdata = LIST_HEAD_INIT(bdata_list);
+
 static int bootmem_debug;
 
 static int __init bootmem_debug_setup(char *buf)
@@ -73,20 +74,16 @@ unsigned long __init bootmem_bootmap_pages(unsigned long pages)
  */
 static void __init link_bootmem(bootmem_data_t *bdata)
 {
-	bootmem_data_t *ent;
+	struct list_head *iter;
 
-	if (list_empty(&bdata_list)) {
-		list_add(&bdata->list, &bdata_list);
-		return;
-	}
-	/* insert in order */
-	list_for_each_entry(ent, &bdata_list, list) {
-		if (bdata->node_boot_start < ent->node_boot_start) {
-			list_add_tail(&bdata->list, &ent->list);
-			return;
-		}
+	list_for_each(iter, &bdata_list) {
+		bootmem_data_t *ent;
+
+		ent = list_entry(iter, bootmem_data_t, list);
+		if (bdata->node_boot_start < ent->node_boot_start)
+			break;
 	}
-	list_add_tail(&bdata->list, &bdata_list);
+	list_add_tail(&bdata->list, iter);
 }
 
 /*