Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 308882
b: refs/heads/master
c: 5c2b8a1
h: refs/heads/master
v: v3
  • Loading branch information
Gavin Shan authored and Linus Torvalds committed May 29, 2012
1 parent ddd4342 commit df6aa34
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e48982734ea0500d1eba4f9d96195acc5406cad6
refs/heads/master: 5c2b8a162b5f8616f709bf20d5ec88f709485522
16 changes: 8 additions & 8 deletions trunk/mm/bootmem.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

/*
Expand Down

0 comments on commit df6aa34

Please sign in to comment.