lkml.org 
[lkml]   [2011]   [Nov]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[tip:x86/mm] x86, mm: Move zone init from paging_init() on 64-bit
Commit-ID:  4c0b2e5f8940fec7cbeafcf641fecd5e746329c5
Gitweb: http://git.kernel.org/tip/4c0b2e5f8940fec7cbeafcf641fecd5e746329c5
Author: Pekka Enberg <penberg@kernel.org>
AuthorDate: Tue, 1 Nov 2011 15:58:17 +0200
Committer: Ingo Molnar <mingo@elte.hu>
CommitDate: Fri, 11 Nov 2011 10:22:43 +0100

x86, mm: Move zone init from paging_init() on 64-bit

This patch introduces a zone_sizes_init() helper function on
64-bit to make it more similar to 32-bit init.

Acked-by: Tejun Heo <tj@kernel.org>
Acked-by: Yinghai Lu <yinghai@kernel.org>
Acked-by: David Rientjes <rientjes@google.com>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
Link: http://lkml.kernel.org/r/1320155902-10424-2-git-send-email-penberg@kernel.org
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
arch/x86/mm/init_64.c | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index bbaaa00..3ddda59 100644
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -612,7 +612,7 @@ void __init initmem_init(void)
}
#endif

-void __init paging_init(void)
+static void __init zone_sizes_init(void)
{
unsigned long max_zone_pfns[MAX_NR_ZONES];

@@ -623,6 +623,11 @@ void __init paging_init(void)
max_zone_pfns[ZONE_DMA32] = MAX_DMA32_PFN;
max_zone_pfns[ZONE_NORMAL] = max_pfn;

+ free_area_init_nodes(max_zone_pfns);
+}
+
+void __init paging_init(void)
+{
sparse_memory_present_with_active_regions(MAX_NUMNODES);
sparse_init();

@@ -634,7 +639,7 @@ void __init paging_init(void)
*/
node_clear_state(0, N_NORMAL_MEMORY);

- free_area_init_nodes(max_zone_pfns);
+ zone_sizes_init();
}

/*

\
 
 \ /
  Last update: 2011-11-19 00:27    [W:0.114 / U:0.476 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site