From df6aa34ad9ce7cc6773464cc59e104fc4812fa99 Mon Sep 17 00:00:00 2001 From: Gavin Shan Date: Tue, 29 May 2012 15:06:46 -0700 Subject: [PATCH] --- yaml --- r: 308882 b: refs/heads/master c: 5c2b8a162b5f8616f709bf20d5ec88f709485522 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/mm/bootmem.c | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 249b1ee10b91..e2f470134fb3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e48982734ea0500d1eba4f9d96195acc5406cad6 +refs/heads/master: 5c2b8a162b5f8616f709bf20d5ec88f709485522 diff --git a/trunk/mm/bootmem.c b/trunk/mm/bootmem.c index d1c7a79d6f3a..ec4fcb7a56c8 100644 --- a/trunk/mm/bootmem.c +++ b/trunk/mm/bootmem.c @@ -77,16 +77,16 @@ unsigned long __init bootmem_bootmap_pages(unsigned long pages) */ static void __init link_bootmem(bootmem_data_t *bdata) { - struct list_head *iter; + bootmem_data_t *ent; - list_for_each(iter, &bdata_list) { - bootmem_data_t *ent; - - ent = list_entry(iter, bootmem_data_t, list); - if (bdata->node_min_pfn < ent->node_min_pfn) - break; + list_for_each_entry(ent, &bdata_list, list) { + if (bdata->node_min_pfn < ent->node_min_pfn) { + list_add_tail(&bdata->list, &ent->list); + return; + } } - list_add_tail(&bdata->list, iter); + + list_add_tail(&bdata->list, &bdata_list); } /*