diff options
author | Pekka Enberg <penberg@cs.helsinki.fi> | 2010-02-24 17:04:47 +0200 |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2010-02-25 15:15:21 -0800 |
commit | c1fd1b43831fa20c91cdd461342af8edf2e87c2f (patch) | |
tree | 7fdd25e5895a384241b2b306dd54c9c3e1c9d602 /arch/x86/mm/init.c | |
parent | 14315592009c17035cac81f4954d5a1f4d71e489 (diff) | |
download | kernel_samsung_crespo-c1fd1b43831fa20c91cdd461342af8edf2e87c2f.zip kernel_samsung_crespo-c1fd1b43831fa20c91cdd461342af8edf2e87c2f.tar.gz kernel_samsung_crespo-c1fd1b43831fa20c91cdd461342af8edf2e87c2f.tar.bz2 |
x86, mm: Unify kernel_physical_mapping_init() API
This patch changes the 32-bit version of kernel_physical_mapping_init() to
return the last mapped address like the 64-bit one so that we can unify the
call-site in init_memory_mapping().
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
LKML-Reference: <alpine.DEB.2.00.1002241703570.1180@melkki.cs.helsinki.fi>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/mm/init.c')
-rw-r--r-- | arch/x86/mm/init.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c index d406c52..e71c5cb 100644 --- a/arch/x86/mm/init.c +++ b/arch/x86/mm/init.c @@ -266,16 +266,9 @@ unsigned long __init_refok init_memory_mapping(unsigned long start, if (!after_bootmem) find_early_table_space(end, use_pse, use_gbpages); -#ifdef CONFIG_X86_32 - for (i = 0; i < nr_range; i++) - kernel_physical_mapping_init(mr[i].start, mr[i].end, - mr[i].page_size_mask); - ret = end; -#else /* CONFIG_X86_64 */ for (i = 0; i < nr_range; i++) ret = kernel_physical_mapping_init(mr[i].start, mr[i].end, mr[i].page_size_mask); -#endif #ifdef CONFIG_X86_32 early_ioremap_page_table_range_init(); |