diff options
| author | Yinghai Lu | 2012-11-17 04:39:08 +0100 |
|---|---|---|
| committer | H. Peter Anvin | 2012-11-17 20:59:37 +0100 |
| commit | 148b20989e0b83cb301e1fcd9e987c7abde05333 (patch) | |
| tree | a60b9f7e59c365a498a2bb47341264b430f70a9f /arch/x86/kernel/setup.c | |
| parent | x86, mm: Move back pgt_buf_* to mm/init.c (diff) | |
| download | kernel-qcow2-linux-148b20989e0b83cb301e1fcd9e987c7abde05333.tar.gz kernel-qcow2-linux-148b20989e0b83cb301e1fcd9e987c7abde05333.tar.xz kernel-qcow2-linux-148b20989e0b83cb301e1fcd9e987c7abde05333.zip | |
x86, mm: Move init_gbpages() out of setup.c
Put it in mm/init.c, and call it from probe_page_mask().
init_mem_mapping is calling probe_page_mask at first.
So calling sequence is not changed.
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Link: http://lkml.kernel.org/r/1353123563-3103-32-git-send-email-yinghai@kernel.org
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/x86/kernel/setup.c')
| -rw-r--r-- | arch/x86/kernel/setup.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 20151941cce8..85b62f1c8071 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -282,18 +282,7 @@ void * __init extend_brk(size_t size, size_t align) return ret; } -#ifdef CONFIG_X86_64 -static void __init init_gbpages(void) -{ - if (direct_gbpages && cpu_has_gbpages) - printk(KERN_INFO "Using GB pages for direct mapping\n"); - else - direct_gbpages = 0; -} -#else -static inline void init_gbpages(void) -{ -} +#ifdef CONFIG_X86_32 static void __init cleanup_highmap(void) { } @@ -933,8 +922,6 @@ void __init setup_arch(char **cmdline_p) setup_real_mode(); - init_gbpages(); - init_mem_mapping(); memblock.current_limit = get_max_mapped(); |