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

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

x86, NUMA: Move numa_nodes_parsed to numa.[hc] 



Move numa_nodes_parsed from numa_64.[hc] to numa.[hc] to prepare for
NUMA init path unification.

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 daf4f480

arch/x86/include/asm/numa.h

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
 * numa_cpu_node().

 */

extern s16 __apicid_to_node[MAX_LOCAL_APIC];

extern nodemask_t numa_nodes_parsed __initdata;



static inline void set_apicid_to_node(int apicid, s16 node)

{

arch/x86/include/asm/numa_64.h

+0 −4
Original line number Diff line number Diff line 
#ifndef _ASM_X86_NUMA_64_H

#define _ASM_X86_NUMA_64_H



#include <linux/nodemask.h>



#define ZONE_ALIGN (1UL << (MAX_ORDER+PAGE_SHIFT))



extern int numa_off;
@@ -17,8 +15,6 @@ extern unsigned long numa_free_all_bootmem(void); 
 */

#define NODE_MIN_SIZE (4*1024*1024)



extern nodemask_t numa_nodes_parsed __initdata;



extern int __init numa_add_memblk(int nodeid, u64 start, u64 end);

extern void __init numa_set_distance(int from, int to, int distance);

arch/x86/mm/numa.c

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
#include <asm/acpi.h>



int __initdata numa_off;

nodemask_t numa_nodes_parsed __initdata;



static __init int numa_setup(char *opt)

{

arch/x86/mm/numa_64.c

+0 −2
Original line number Diff line number Diff line
@@ -26,8 +26,6 @@ 
struct pglist_data *node_data[MAX_NUMNODES] __read_mostly;

EXPORT_SYMBOL(node_data);



nodemask_t numa_nodes_parsed __initdata;



static struct numa_meminfo numa_meminfo

#ifndef CONFIG_MEMORY_HOTPLUG

__initdata