diff options
author | Jiang Liu <liuj97@gmail.com> | 2013-07-03 18:03:58 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-07-03 19:07:36 -0400 |
commit | de4bcddc13be31c669fc74cd2b400e1e7a1fdbcf (patch) | |
tree | 4459e1e94c03e4f2c7396ddb517eedf9d2def134 /arch/ia64/mm/discontig.c | |
parent | 5dc355c146689ac5a9d57dff349958585da21fe3 (diff) |
mm/IA64: prepare for removing num_physpages and simplify mem_init()
Prepare for removing num_physpages and simplify mem_init().
Signed-off-by: Jiang Liu <jiang.liu@huawei.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: Zhang Yanfei <zhangyanfei@cn.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/ia64/mm/discontig.c')
-rw-r--r-- | arch/ia64/mm/discontig.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/ia64/mm/discontig.c b/arch/ia64/mm/discontig.c index ae4db4bd6d97..58550b8f7d40 100644 --- a/arch/ia64/mm/discontig.c +++ b/arch/ia64/mm/discontig.c | |||
@@ -37,7 +37,6 @@ struct early_node_data { | |||
37 | struct ia64_node_data *node_data; | 37 | struct ia64_node_data *node_data; |
38 | unsigned long pernode_addr; | 38 | unsigned long pernode_addr; |
39 | unsigned long pernode_size; | 39 | unsigned long pernode_size; |
40 | unsigned long num_physpages; | ||
41 | #ifdef CONFIG_ZONE_DMA | 40 | #ifdef CONFIG_ZONE_DMA |
42 | unsigned long num_dma_physpages; | 41 | unsigned long num_dma_physpages; |
43 | #endif | 42 | #endif |
@@ -732,7 +731,6 @@ static __init int count_node_pages(unsigned long start, unsigned long len, int n | |||
732 | { | 731 | { |
733 | unsigned long end = start + len; | 732 | unsigned long end = start + len; |
734 | 733 | ||
735 | mem_data[node].num_physpages += len >> PAGE_SHIFT; | ||
736 | #ifdef CONFIG_ZONE_DMA | 734 | #ifdef CONFIG_ZONE_DMA |
737 | if (start <= __pa(MAX_DMA_ADDRESS)) | 735 | if (start <= __pa(MAX_DMA_ADDRESS)) |
738 | mem_data[node].num_dma_physpages += | 736 | mem_data[node].num_dma_physpages += |
@@ -778,7 +776,6 @@ void __init paging_init(void) | |||
778 | #endif | 776 | #endif |
779 | 777 | ||
780 | for_each_online_node(node) { | 778 | for_each_online_node(node) { |
781 | num_physpages += mem_data[node].num_physpages; | ||
782 | pfn_offset = mem_data[node].min_pfn; | 779 | pfn_offset = mem_data[node].min_pfn; |
783 | 780 | ||
784 | #ifdef CONFIG_VIRTUAL_MEM_MAP | 781 | #ifdef CONFIG_VIRTUAL_MEM_MAP |