diff options
author | Nathan Lynch <nathanl@austin.ibm.com> | 2006-03-20 19:35:15 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-03-21 23:03:48 -0500 |
commit | 2e5ce39d6703836b583c43131c365201a76285a5 (patch) | |
tree | f45152d260b8ad49dc4dcb2ada905eaa24ffdc26 /arch/powerpc/mm | |
parent | bf4b85b0e4bab42b3e8d8b0acc6851bb85e2050b (diff) |
[PATCH] powerpc numa: Minor cpu hotplug-related cleanups
map_cpu_to_node does not need to be inline, it is never called in a
hot path.
map_cpu_to_node, numa_setup_cpu, and find_cpu_node can be marked
__cpuinit, as they are never used after boot if CONFIG_HOTPLUG_CPU=n.
Signed-off-by: Nathan Lynch <nathanl@austin.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/mm')
-rw-r--r-- | arch/powerpc/mm/numa.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c index 2ae491d9404f..1fb11bbe1ace 100644 --- a/arch/powerpc/mm/numa.c +++ b/arch/powerpc/mm/numa.c | |||
@@ -129,7 +129,7 @@ void __init get_region(unsigned int nid, unsigned long *start_pfn, | |||
129 | *start_pfn = 0; | 129 | *start_pfn = 0; |
130 | } | 130 | } |
131 | 131 | ||
132 | static inline void map_cpu_to_node(int cpu, int node) | 132 | static void __cpuinit map_cpu_to_node(int cpu, int node) |
133 | { | 133 | { |
134 | numa_cpu_lookup_table[cpu] = node; | 134 | numa_cpu_lookup_table[cpu] = node; |
135 | 135 | ||
@@ -155,7 +155,7 @@ static void unmap_cpu_from_node(unsigned long cpu) | |||
155 | } | 155 | } |
156 | #endif /* CONFIG_HOTPLUG_CPU */ | 156 | #endif /* CONFIG_HOTPLUG_CPU */ |
157 | 157 | ||
158 | static struct device_node *find_cpu_node(unsigned int cpu) | 158 | static struct device_node * __cpuinit find_cpu_node(unsigned int cpu) |
159 | { | 159 | { |
160 | unsigned int hw_cpuid = get_hard_smp_processor_id(cpu); | 160 | unsigned int hw_cpuid = get_hard_smp_processor_id(cpu); |
161 | struct device_node *cpu_node = NULL; | 161 | struct device_node *cpu_node = NULL; |
@@ -284,7 +284,7 @@ static unsigned long __devinit read_n_cells(int n, unsigned int **buf) | |||
284 | * Figure out to which domain a cpu belongs and stick it there. | 284 | * Figure out to which domain a cpu belongs and stick it there. |
285 | * Return the id of the domain used. | 285 | * Return the id of the domain used. |
286 | */ | 286 | */ |
287 | static int numa_setup_cpu(unsigned long lcpu) | 287 | static int __cpuinit numa_setup_cpu(unsigned long lcpu) |
288 | { | 288 | { |
289 | int numa_domain = 0; | 289 | int numa_domain = 0; |
290 | struct device_node *cpu = find_cpu_node(lcpu); | 290 | struct device_node *cpu = find_cpu_node(lcpu); |