Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 148b2098 authored by Yinghai Lu's avatar Yinghai Lu Committed by H. Peter Anvin
Browse files

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: default avatarYinghai Lu <yinghai@kernel.org>
Link: http://lkml.kernel.org/r/1353123563-3103-32-git-send-email-yinghai@kernel.org


Signed-off-by: default avatarH. Peter Anvin <hpa@linux.intel.com>
parent cf470659

arch/x86/kernel/setup.c

+1 −14
Original line number Diff line number Diff line
@@ -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();

arch/x86/mm/init.c

+12 −0
Original line number Diff line number Diff line
@@ -98,6 +98,16 @@ int direct_gbpages 
#endif

;



static void __init init_gbpages(void)

{

#ifdef CONFIG_X86_64

	if (direct_gbpages && cpu_has_gbpages)

		printk(KERN_INFO "Using GB pages for direct mapping\n");

	else

		direct_gbpages = 0;

#endif

}



struct map_range {

	unsigned long start;

	unsigned long end;
@@ -108,6 +118,8 @@ static int page_size_mask; 


static void __init probe_page_size_mask(void)

{

	init_gbpages();



#if !defined(CONFIG_DEBUG_PAGEALLOC) && !defined(CONFIG_KMEMCHECK)

	/*

	 * For CONFIG_DEBUG_PAGEALLOC, identity mapping will use small pages.