aboutsummaryrefslogtreecommitdiffstats
path: root/arch/alpha/kernel
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2013-06-17 15:43:14 -0400
committerPaul Gortmaker <paul.gortmaker@windriver.com>2013-07-14 19:36:51 -0400
commitab39c77c3246f8462663fb1b07fa193f3e31e255 (patch)
tree555bfb75acbe1d04c05b03de3fd14d8907cd52d1 /arch/alpha/kernel
parentad81f0545ef01ea651886dddac4bef6cec930092 (diff)
alpha: delete __cpuinit usage from all 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 alpha uses of the __cpuinit macros. [1] https://lkml.org/lkml/2013/5/20/589 Cc: Richard Henderson <rth@twiddle.net> Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru> Cc: Matt Turner <mattst88@gmail.com> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Diffstat (limited to 'arch/alpha/kernel')
-rw-r--r--arch/alpha/kernel/smp.c10
-rw-r--r--arch/alpha/kernel/traps.c4
2 files changed, 7 insertions, 7 deletions
diff --git a/arch/alpha/kernel/smp.c b/arch/alpha/kernel/smp.c
index 7b60834fb4b2..53b18a620e1c 100644
--- a/arch/alpha/kernel/smp.c
+++ b/arch/alpha/kernel/smp.c
@@ -116,7 +116,7 @@ wait_boot_cpu_to_stop(int cpuid)
116/* 116/*
117 * Where secondaries begin a life of C. 117 * Where secondaries begin a life of C.
118 */ 118 */
119void __cpuinit 119void
120smp_callin(void) 120smp_callin(void)
121{ 121{
122 int cpuid = hard_smp_processor_id(); 122 int cpuid = hard_smp_processor_id();
@@ -194,7 +194,7 @@ wait_for_txrdy (unsigned long cpumask)
194 * Send a message to a secondary's console. "START" is one such 194 * Send a message to a secondary's console. "START" is one such
195 * interesting message. ;-) 195 * interesting message. ;-)
196 */ 196 */
197static void __cpuinit 197static void
198send_secondary_console_msg(char *str, int cpuid) 198send_secondary_console_msg(char *str, int cpuid)
199{ 199{
200 struct percpu_struct *cpu; 200 struct percpu_struct *cpu;
@@ -285,7 +285,7 @@ recv_secondary_console_msg(void)
285/* 285/*
286 * Convince the console to have a secondary cpu begin execution. 286 * Convince the console to have a secondary cpu begin execution.
287 */ 287 */
288static int __cpuinit 288static int
289secondary_cpu_start(int cpuid, struct task_struct *idle) 289secondary_cpu_start(int cpuid, struct task_struct *idle)
290{ 290{
291 struct percpu_struct *cpu; 291 struct percpu_struct *cpu;
@@ -356,7 +356,7 @@ secondary_cpu_start(int cpuid, struct task_struct *idle)
356/* 356/*
357 * Bring one cpu online. 357 * Bring one cpu online.
358 */ 358 */
359static int __cpuinit 359static int
360smp_boot_one_cpu(int cpuid, struct task_struct *idle) 360smp_boot_one_cpu(int cpuid, struct task_struct *idle)
361{ 361{
362 unsigned long timeout; 362 unsigned long timeout;
@@ -472,7 +472,7 @@ smp_prepare_boot_cpu(void)
472{ 472{
473} 473}
474 474
475int __cpuinit 475int
476__cpu_up(unsigned int cpu, struct task_struct *tidle) 476__cpu_up(unsigned int cpu, struct task_struct *tidle)
477{ 477{
478 smp_boot_one_cpu(cpu, tidle); 478 smp_boot_one_cpu(cpu, tidle);
diff --git a/arch/alpha/kernel/traps.c b/arch/alpha/kernel/traps.c
index affccb959a9e..be1fba334bd0 100644
--- a/arch/alpha/kernel/traps.c
+++ b/arch/alpha/kernel/traps.c
@@ -32,7 +32,7 @@
32 32
33static int opDEC_fix; 33static int opDEC_fix;
34 34
35static void __cpuinit 35static void
36opDEC_check(void) 36opDEC_check(void)
37{ 37{
38 __asm__ __volatile__ ( 38 __asm__ __volatile__ (
@@ -1059,7 +1059,7 @@ give_sigbus:
1059 return; 1059 return;
1060} 1060}
1061 1061
1062void __cpuinit 1062void
1063trap_init(void) 1063trap_init(void)
1064{ 1064{
1065 /* Tell PAL-code what global pointer we want in the kernel. */ 1065 /* Tell PAL-code what global pointer we want in the kernel. */