Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 126260
b: refs/heads/master
c: 594fe1a
h: refs/heads/master
v: v3
  • Loading branch information
Johannes Weiner authored and Linus Torvalds committed Jan 6, 2009
1 parent 9bf9ea0 commit 8782d73
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 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: dcd4a049b9751828c516c59709f3fdf50436df85
refs/heads/master: 594fe1a044325bb0a1a49ca7d086e3df4f1df59a
8 changes: 4 additions & 4 deletions trunk/mm/bootmem.c
Original file line number Diff line number Diff line change
Expand Up @@ -435,17 +435,17 @@ static void * __init alloc_bootmem_core(struct bootmem_data *bdata,
unsigned long fallback = 0;
unsigned long min, max, start, sidx, midx, step;

bdebug("nid=%td size=%lx [%lu pages] align=%lx goal=%lx limit=%lx\n",
bdata - bootmem_node_data, size, PAGE_ALIGN(size) >> PAGE_SHIFT,
align, goal, limit);

BUG_ON(!size);
BUG_ON(align & (align - 1));
BUG_ON(limit && goal + size > limit);

if (!bdata->node_bootmem_map)
return NULL;

bdebug("nid=%td size=%lx [%lu pages] align=%lx goal=%lx limit=%lx\n",
bdata - bootmem_node_data, size, PAGE_ALIGN(size) >> PAGE_SHIFT,
align, goal, limit);

min = bdata->node_min_pfn;
max = bdata->node_low_pfn;

Expand Down

0 comments on commit 8782d73

Please sign in to comment.