lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

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

Signed-off-by: Tejun 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>
This commit is contained in:
Tejun Heo
2011-05-02 14:18:53 +02:00
parent daf4f480ae
commit e6df595b37
4 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/x86/include/asm/numa.h
View File

@@ -19,6 +19,7 @@
* numa_cpu_node(). * numa_cpu_node().
*/ */
extern s16 __apicid_to_node[MAX_LOCAL_APIC]; 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) static inline void set_apicid_to_node(int apicid, s16 node)
{ {

4
arch/x86/include/asm/numa_64.h
View File

@@ -1,8 +1,6 @@
#ifndef _ASM_X86_NUMA_64_H #ifndef _ASM_X86_NUMA_64_H
#define _ASM_X86_NUMA_64_H #define _ASM_X86_NUMA_64_H
#include <linux/nodemask.h>
#define ZONE_ALIGN (1UL << (MAX_ORDER+PAGE_SHIFT)) #define ZONE_ALIGN (1UL << (MAX_ORDER+PAGE_SHIFT))
extern int numa_off; extern int numa_off;
@@ -17,8 +15,6 @@ extern unsigned long numa_free_all_bootmem(void);
*/ */
#define NODE_MIN_SIZE (4*1024*1024) #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 int __init numa_add_memblk(int nodeid, u64 start, u64 end);
extern void __init numa_set_distance(int from, int to, int distance); extern void __init numa_set_distance(int from, int to, int distance);

1
arch/x86/mm/numa.c
View File

@@ -6,6 +6,7 @@
#include <asm/acpi.h> #include <asm/acpi.h>
int __initdata numa_off; int __initdata numa_off;
nodemask_t numa_nodes_parsed __initdata;
static __init int numa_setup(char *opt) static __init int numa_setup(char *opt)
{ {

2
arch/x86/mm/numa_64.c
View File

@@ -26,8 +26,6 @@
struct pglist_data *node_data[MAX_NUMNODES] __read_mostly; struct pglist_data *node_data[MAX_NUMNODES] __read_mostly;
EXPORT_SYMBOL(node_data); EXPORT_SYMBOL(node_data);
nodemask_t numa_nodes_parsed __initdata;
static struct numa_meminfo numa_meminfo static struct numa_meminfo numa_meminfo
#ifndef CONFIG_MEMORY_HOTPLUG #ifndef CONFIG_MEMORY_HOTPLUG
__initdata __initdata