diff options
author | Andi Kleen <ak@suse.de> | 2006-03-25 10:29:12 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-25 12:10:52 -0500 |
commit | abe059e7590fd4475285f2d037c70dec712a4572 (patch) | |
tree | 4c15ffcf11786a89cd87d0766c6d6717342aa722 /arch | |
parent | 913bd906019514579b3c7ec5ab9c463e89207a57 (diff) |
[PATCH] x86_64: Rename struct node in x86-64 NUMA code to struct bootnode
It conflicts with the struct node in node.h
Actually the x86-64 version was there first, but ..
Suggested by Jan Beulich
Cc: jbeulich@novell.com
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/x86_64/mm/k8topology.c | 2 | ||||
-rw-r--r-- | arch/x86_64/mm/numa.c | 6 | ||||
-rw-r--r-- | arch/x86_64/mm/srat.c | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/arch/x86_64/mm/k8topology.c b/arch/x86_64/mm/k8topology.c index dd60e71fdba6..7c45c2d2b8b2 100644 --- a/arch/x86_64/mm/k8topology.c +++ b/arch/x86_64/mm/k8topology.c | |||
@@ -43,7 +43,7 @@ static __init int find_northbridge(void) | |||
43 | int __init k8_scan_nodes(unsigned long start, unsigned long end) | 43 | int __init k8_scan_nodes(unsigned long start, unsigned long end) |
44 | { | 44 | { |
45 | unsigned long prevbase; | 45 | unsigned long prevbase; |
46 | struct node nodes[8]; | 46 | struct bootnode nodes[8]; |
47 | int nodeid, i, nb; | 47 | int nodeid, i, nb; |
48 | unsigned char nodeids[8]; | 48 | unsigned char nodeids[8]; |
49 | int found = 0; | 49 | int found = 0; |
diff --git a/arch/x86_64/mm/numa.c b/arch/x86_64/mm/numa.c index 22e51beee8d3..e4b62753a19a 100644 --- a/arch/x86_64/mm/numa.c +++ b/arch/x86_64/mm/numa.c | |||
@@ -47,7 +47,7 @@ int numa_off __initdata; | |||
47 | * -1 if node overlap or lost ram (shift too big) | 47 | * -1 if node overlap or lost ram (shift too big) |
48 | */ | 48 | */ |
49 | static int __init | 49 | static int __init |
50 | populate_memnodemap(const struct node *nodes, int numnodes, int shift) | 50 | populate_memnodemap(const struct bootnode *nodes, int numnodes, int shift) |
51 | { | 51 | { |
52 | int i; | 52 | int i; |
53 | int res = -1; | 53 | int res = -1; |
@@ -74,7 +74,7 @@ populate_memnodemap(const struct node *nodes, int numnodes, int shift) | |||
74 | return res; | 74 | return res; |
75 | } | 75 | } |
76 | 76 | ||
77 | int __init compute_hash_shift(struct node *nodes, int numnodes) | 77 | int __init compute_hash_shift(struct bootnode *nodes, int numnodes) |
78 | { | 78 | { |
79 | int shift = 20; | 79 | int shift = 20; |
80 | 80 | ||
@@ -191,7 +191,7 @@ int numa_fake __initdata = 0; | |||
191 | static int numa_emulation(unsigned long start_pfn, unsigned long end_pfn) | 191 | static int numa_emulation(unsigned long start_pfn, unsigned long end_pfn) |
192 | { | 192 | { |
193 | int i; | 193 | int i; |
194 | struct node nodes[MAX_NUMNODES]; | 194 | struct bootnode nodes[MAX_NUMNODES]; |
195 | unsigned long sz = ((end_pfn - start_pfn)<<PAGE_SHIFT) / numa_fake; | 195 | unsigned long sz = ((end_pfn - start_pfn)<<PAGE_SHIFT) / numa_fake; |
196 | 196 | ||
197 | /* Kludge needed for the hash function */ | 197 | /* Kludge needed for the hash function */ |
diff --git a/arch/x86_64/mm/srat.c b/arch/x86_64/mm/srat.c index 482c25767369..2eb879590dc4 100644 --- a/arch/x86_64/mm/srat.c +++ b/arch/x86_64/mm/srat.c | |||
@@ -23,7 +23,7 @@ static struct acpi_table_slit *acpi_slit; | |||
23 | 23 | ||
24 | static nodemask_t nodes_parsed __initdata; | 24 | static nodemask_t nodes_parsed __initdata; |
25 | static nodemask_t nodes_found __initdata; | 25 | static nodemask_t nodes_found __initdata; |
26 | static struct node nodes[MAX_NUMNODES] __initdata; | 26 | static struct bootnode nodes[MAX_NUMNODES] __initdata; |
27 | static u8 pxm2node[256] = { [0 ... 255] = 0xff }; | 27 | static u8 pxm2node[256] = { [0 ... 255] = 0xff }; |
28 | 28 | ||
29 | /* Too small nodes confuse the VM badly. Usually they result | 29 | /* Too small nodes confuse the VM badly. Usually they result |
@@ -57,7 +57,7 @@ static __init int conflicting_nodes(unsigned long start, unsigned long end) | |||
57 | { | 57 | { |
58 | int i; | 58 | int i; |
59 | for_each_node_mask(i, nodes_parsed) { | 59 | for_each_node_mask(i, nodes_parsed) { |
60 | struct node *nd = &nodes[i]; | 60 | struct bootnode *nd = &nodes[i]; |
61 | if (nd->start == nd->end) | 61 | if (nd->start == nd->end) |
62 | continue; | 62 | continue; |
63 | if (nd->end > start && nd->start < end) | 63 | if (nd->end > start && nd->start < end) |
@@ -70,7 +70,7 @@ static __init int conflicting_nodes(unsigned long start, unsigned long end) | |||
70 | 70 | ||
71 | static __init void cutoff_node(int i, unsigned long start, unsigned long end) | 71 | static __init void cutoff_node(int i, unsigned long start, unsigned long end) |
72 | { | 72 | { |
73 | struct node *nd = &nodes[i]; | 73 | struct bootnode *nd = &nodes[i]; |
74 | if (nd->start < start) { | 74 | if (nd->start < start) { |
75 | nd->start = start; | 75 | nd->start = start; |
76 | if (nd->end < nd->start) | 76 | if (nd->end < nd->start) |
@@ -159,7 +159,7 @@ acpi_numa_processor_affinity_init(struct acpi_table_processor_affinity *pa) | |||
159 | void __init | 159 | void __init |
160 | acpi_numa_memory_affinity_init(struct acpi_table_memory_affinity *ma) | 160 | acpi_numa_memory_affinity_init(struct acpi_table_memory_affinity *ma) |
161 | { | 161 | { |
162 | struct node *nd; | 162 | struct bootnode *nd; |
163 | unsigned long start, end; | 163 | unsigned long start, end; |
164 | int node, pxm; | 164 | int node, pxm; |
165 | int i; | 165 | int i; |