Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 332432
b: refs/heads/master
c: f2d52fe
h: refs/heads/master
v: v3
  • Loading branch information
Wanpeng Li authored and Linus Torvalds committed Oct 9, 2012
1 parent 53d2244 commit 1c7f248
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 6 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: e9d24ad30fc5c4c601824fb39712350b053ca812
refs/heads/master: f2d52fe51c8c0a18cf5fbe583bad51090d12c146
3 changes: 1 addition & 2 deletions trunk/include/linux/memblock.h
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,7 @@ void __next_mem_pfn_range(int *idx, int nid, unsigned long *out_start_pfn,
* @p_end: ptr to ulong for end pfn of the range, can be %NULL
* @p_nid: ptr to int for nid of the range, can be %NULL
*
* Walks over configured memory ranges. Available after early_node_map is
* populated.
* Walks over configured memory ranges.
*/
#define for_each_mem_pfn_range(i, nid, p_start, p_end, p_nid) \
for (i = -1, __next_mem_pfn_range(&i, nid, p_start, p_end, p_nid); \
Expand Down
2 changes: 0 additions & 2 deletions trunk/mm/nobootmem.c
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +162,6 @@ unsigned long __init free_all_bootmem(void)
* We need to use MAX_NUMNODES instead of NODE_DATA(0)->node_id
* because in some case like Node0 doesn't have RAM installed
* low ram will be on Node1
* Use MAX_NUMNODES will make sure all ranges in early_node_map[]
* will be used instead of only Node0 related
*/
return free_low_memory_core_early(MAX_NUMNODES);
}
Expand Down
2 changes: 1 addition & 1 deletion trunk/mm/page_alloc.c
Original file line number Diff line number Diff line change
Expand Up @@ -4931,7 +4931,7 @@ void __init free_area_init_nodes(unsigned long *max_zone_pfn)
zone_movable_pfn[i] << PAGE_SHIFT);
}

/* Print out the early_node_map[] */
/* Print out the early node map */
printk("Early memory node ranges\n");
for_each_mem_pfn_range(i, MAX_NUMNODES, &start_pfn, &end_pfn, &nid)
printk(" node %3d: [mem %#010lx-%#010lx]\n", nid,
Expand Down

0 comments on commit 1c7f248

Please sign in to comment.