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

Commit daf4f480 authored by Tejun Heo's avatar Tejun Heo
Browse files

x86-32, NUMA: Move get_memcfg_numa() into numa_32.c 



There's no reason get_memcfg_numa() to be implemented inline in
mmzone_32.h.  Move it to numa_32.c and also make
get_memcfg_numa_flag() static.

Signed-off-by: default avatarTejun Heo <tj@kernel.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: David Rientjes <rientjes@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
parent eca9ad31

arch/x86/include/asm/mmzone_32.h

+0 −18
Original line number Diff line number Diff line
@@ -16,28 +16,10 @@ extern struct pglist_data *node_data[]; 
/* summit or generic arch */

#include <asm/srat.h>



extern int get_memcfg_numa_flat(void);

/*

 * This allows any one NUMA architecture to be compiled

 * for, and still fall back to the flat function if it

 * fails.

 */

static inline void get_memcfg_numa(void)

{



	if (get_memcfg_numaq())

		return;

	if (get_memcfg_from_srat())

		return;

	get_memcfg_numa_flat();

}



extern void resume_map_numa_kva(pgd_t *pgd);



#else /* !CONFIG_NUMA */



#define get_memcfg_numa get_memcfg_numa_flat



static inline void resume_map_numa_kva(pgd_t *pgd) {}



#endif /* CONFIG_NUMA */

arch/x86/mm/numa_32.c

+10 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ void set_pmd_pfn(unsigned long vaddr, unsigned long pfn, pgprot_t flags); 
 *        a single node with all available processors in it with a flat

 *        memory map.

 */

int __init get_memcfg_numa_flat(void)

static int __init get_memcfg_numa_flat(void)

{

	printk(KERN_DEBUG "NUMA - single node, flat memory mode\n");
@@ -332,6 +332,15 @@ static __init void init_alloc_remap(int nid) 
	       nid, node_pa, node_pa + size, remap_va, remap_va + size);

}



static void get_memcfg_numa(void)

{

	if (get_memcfg_numaq())

		return;

	if (get_memcfg_from_srat())

		return;

	get_memcfg_numa_flat();

}



void __init initmem_init(void)

{

	int nid;