aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ia64/mm
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2013-06-17 15:51:20 -0400
committerTony Luck <tony.luck@intel.com>2013-06-24 18:44:27 -0400
commitccce9bb83ed20bca52f82ff9d7cf889d23a2ec01 (patch)
tree92603d8bec61c30766dd0ae9e46fff1b6416131e /arch/ia64/mm
parent69cbc0464d87bfa38c0a4fe4d8bb751c1ec8cedf (diff)
[IA64] Delete __cpuinit usage from all ia64 users
The __cpuinit type of throwaway sections might have made sense some time ago when RAM was more constrained, but now the savings do not offset the cost and complications. For example, the fix in commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time") is a good example of the nasty type of bugs that can be created with improper use of the various __init prefixes. After a discussion on LKML[1] it was decided that cpuinit should go the way of devinit and be phased out. Once all the users are gone, we can then finally remove the macros themselves from linux/init.h. This removes all the ia64 uses of the __cpuinit macros. [1] https://lkml.org/lkml/2013/5/20/589 Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64/mm')
-rw-r--r--arch/ia64/mm/contig.c3
-rw-r--r--arch/ia64/mm/discontig.c2
-rw-r--r--arch/ia64/mm/numa.c2
3 files changed, 3 insertions, 4 deletions
diff --git a/arch/ia64/mm/contig.c b/arch/ia64/mm/contig.c
index 67c59ebec899..142c3b785944 100644
--- a/arch/ia64/mm/contig.c
+++ b/arch/ia64/mm/contig.c
@@ -156,8 +156,7 @@ static void *cpu_data;
156 * 156 *
157 * Allocate and setup per-cpu data areas. 157 * Allocate and setup per-cpu data areas.
158 */ 158 */
159void * __cpuinit 159void *per_cpu_init(void)
160per_cpu_init (void)
161{ 160{
162 static bool first_time = true; 161 static bool first_time = true;
163 void *cpu0_data = __cpu0_per_cpu; 162 void *cpu0_data = __cpu0_per_cpu;
diff --git a/arch/ia64/mm/discontig.c b/arch/ia64/mm/discontig.c
index ae4db4bd6d97..7253d83650bf 100644
--- a/arch/ia64/mm/discontig.c
+++ b/arch/ia64/mm/discontig.c
@@ -593,7 +593,7 @@ void __init find_memory(void)
593 * find_pernode_space() does most of this already, we just need to set 593 * find_pernode_space() does most of this already, we just need to set
594 * local_per_cpu_offset 594 * local_per_cpu_offset
595 */ 595 */
596void __cpuinit *per_cpu_init(void) 596void *per_cpu_init(void)
597{ 597{
598 int cpu; 598 int cpu;
599 static int first_time = 1; 599 static int first_time = 1;
diff --git a/arch/ia64/mm/numa.c b/arch/ia64/mm/numa.c
index 4248492b9321..ea21d4cad540 100644
--- a/arch/ia64/mm/numa.c
+++ b/arch/ia64/mm/numa.c
@@ -86,7 +86,7 @@ int __meminit __early_pfn_to_nid(unsigned long pfn)
86 return -1; 86 return -1;
87} 87}
88 88
89void __cpuinit numa_clear_node(int cpu) 89void numa_clear_node(int cpu)
90{ 90{
91 unmap_cpu_from_node(cpu, NUMA_NO_NODE); 91 unmap_cpu_from_node(cpu, NUMA_NO_NODE);
92} 92}