diff options
author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2013-06-18 16:56:21 -0400 |
---|---|---|
committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2013-07-14 19:36:53 -0400 |
commit | 13dff62d80e93f1cc65b4ad2dddedd12de720272 (patch) | |
tree | 51dd8b02bc07dd60da76907d11d2d9aef95ac3ba /arch/blackfin/kernel | |
parent | b8c6453aaf142620c2e1a4c2da24bbb10cb424bf (diff) |
blackfin: delete __cpuinit usage from all blackfin files
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.
Note that some harmless section mismatch warnings may result, since
notify_cpu_starting() and cpu_up() are arch independent (kernel/cpu.c)
are flagged as __cpuinit -- so if we remove the __cpuinit from
arch specific callers, we will also get section mismatch warnings.
As an intermediate step, we intend to turn the linux/init.h cpuinit
content into no-ops as early as possible, since that will get rid
of these warnings. In any case, they are temporary and harmless.
This removes all the arch/blackfin uses of the __cpuinit macros from
all C files. Currently blackfin does not have any __CPUINIT used in
assembly files.
[1] https://lkml.org/lkml/2013/5/20/589
Cc: Mike Frysinger <vapier@gentoo.org>
Cc: Bob Liu <lliubbo@gmail.com>
Cc: Sonic Zhang <sonic.zhang@analog.com>
Cc: uclinux-dist-devel@blackfin.uclinux.org
Acked-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Diffstat (limited to 'arch/blackfin/kernel')
-rw-r--r-- | arch/blackfin/kernel/perf_event.c | 2 | ||||
-rw-r--r-- | arch/blackfin/kernel/setup.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/blackfin/kernel/perf_event.c b/arch/blackfin/kernel/perf_event.c index e47d19ae3e06..974e55496db3 100644 --- a/arch/blackfin/kernel/perf_event.c +++ b/arch/blackfin/kernel/perf_event.c | |||
@@ -468,7 +468,7 @@ static void bfin_pmu_setup(int cpu) | |||
468 | memset(cpuhw, 0, sizeof(struct cpu_hw_events)); | 468 | memset(cpuhw, 0, sizeof(struct cpu_hw_events)); |
469 | } | 469 | } |
470 | 470 | ||
471 | static int __cpuinit | 471 | static int |
472 | bfin_pmu_notifier(struct notifier_block *self, unsigned long action, void *hcpu) | 472 | bfin_pmu_notifier(struct notifier_block *self, unsigned long action, void *hcpu) |
473 | { | 473 | { |
474 | unsigned int cpu = (long)hcpu; | 474 | unsigned int cpu = (long)hcpu; |
diff --git a/arch/blackfin/kernel/setup.c b/arch/blackfin/kernel/setup.c index 107b306b06f1..19ad0637e8ff 100644 --- a/arch/blackfin/kernel/setup.c +++ b/arch/blackfin/kernel/setup.c | |||
@@ -99,7 +99,7 @@ void __init generate_cplb_tables(void) | |||
99 | } | 99 | } |
100 | #endif | 100 | #endif |
101 | 101 | ||
102 | void __cpuinit bfin_setup_caches(unsigned int cpu) | 102 | void bfin_setup_caches(unsigned int cpu) |
103 | { | 103 | { |
104 | #ifdef CONFIG_BFIN_ICACHE | 104 | #ifdef CONFIG_BFIN_ICACHE |
105 | bfin_icache_init(icplb_tbl[cpu]); | 105 | bfin_icache_init(icplb_tbl[cpu]); |
@@ -165,7 +165,7 @@ void __cpuinit bfin_setup_caches(unsigned int cpu) | |||
165 | #endif | 165 | #endif |
166 | } | 166 | } |
167 | 167 | ||
168 | void __cpuinit bfin_setup_cpudata(unsigned int cpu) | 168 | void bfin_setup_cpudata(unsigned int cpu) |
169 | { | 169 | { |
170 | struct blackfin_cpudata *cpudata = &per_cpu(cpu_data, cpu); | 170 | struct blackfin_cpudata *cpudata = &per_cpu(cpu_data, cpu); |
171 | 171 | ||