diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-08-11 06:57:01 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-08-11 06:57:01 -0400 |
commit | 6de9c70882ecdee63a652d493bf2353963bd4c22 (patch) | |
tree | 9d219e705492331c97f5f7dccce3b0b1a29251bf /mm/sparse.c | |
parent | d406d21d90dce2e66c7eb4a44605aac947fe55fb (diff) | |
parent | 796aadeb1b2db9b5d463946766c5bbfd7717158c (diff) |
Merge branch 'linus' into x86/cleanups
Diffstat (limited to 'mm/sparse.c')
-rw-r--r-- | mm/sparse.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/sparse.c b/mm/sparse.c index 8ffc08990008..5d9dbbb9d39e 100644 --- a/mm/sparse.c +++ b/mm/sparse.c | |||
@@ -377,7 +377,7 @@ struct page __init *sparse_mem_map_populate(unsigned long pnum, int nid) | |||
377 | } | 377 | } |
378 | #endif /* !CONFIG_SPARSEMEM_VMEMMAP */ | 378 | #endif /* !CONFIG_SPARSEMEM_VMEMMAP */ |
379 | 379 | ||
380 | struct page __init *sparse_early_mem_map_alloc(unsigned long pnum) | 380 | static struct page __init *sparse_early_mem_map_alloc(unsigned long pnum) |
381 | { | 381 | { |
382 | struct page *map; | 382 | struct page *map; |
383 | struct mem_section *ms = __nr_to_section(pnum); | 383 | struct mem_section *ms = __nr_to_section(pnum); |