diff options
author | Helge Deller <deller@gmx.de> | 2017-09-21 15:22:27 -0400 |
---|---|---|
committer | Helge Deller <deller@gmx.de> | 2017-09-22 13:47:08 -0400 |
commit | a7e6601f70a53957b1d01c321319f0237bba5202 (patch) | |
tree | fd661afb009f4275806a7303914d48ba912805c8 | |
parent | ea6976483fb0ced259fbaa9e4f68a2cdcee7e312 (diff) |
parisc: Move init_per_cpu() into init section
Signed-off-by: Helge Deller <deller@gmx.de>
-rw-r--r-- | arch/parisc/include/asm/smp.h | 1 | ||||
-rw-r--r-- | arch/parisc/kernel/processor.c | 2 | ||||
-rw-r--r-- | arch/parisc/kernel/setup.c | 2 | ||||
-rw-r--r-- | arch/parisc/kernel/smp.c | 3 |
4 files changed, 4 insertions, 4 deletions
diff --git a/arch/parisc/include/asm/smp.h b/arch/parisc/include/asm/smp.h index a5dc9066c6d8..ad9c9c3b4136 100644 --- a/arch/parisc/include/asm/smp.h +++ b/arch/parisc/include/asm/smp.h | |||
@@ -1,6 +1,7 @@ | |||
1 | #ifndef __ASM_SMP_H | 1 | #ifndef __ASM_SMP_H |
2 | #define __ASM_SMP_H | 2 | #define __ASM_SMP_H |
3 | 3 | ||
4 | extern int init_per_cpu(int cpuid); | ||
4 | 5 | ||
5 | #if defined(CONFIG_SMP) | 6 | #if defined(CONFIG_SMP) |
6 | 7 | ||
diff --git a/arch/parisc/kernel/processor.c b/arch/parisc/kernel/processor.c index a778bd3c107c..e120d63c1b28 100644 --- a/arch/parisc/kernel/processor.c +++ b/arch/parisc/kernel/processor.c | |||
@@ -317,7 +317,7 @@ void __init collect_boot_cpu_data(void) | |||
317 | * | 317 | * |
318 | * o Enable CPU profiling hooks. | 318 | * o Enable CPU profiling hooks. |
319 | */ | 319 | */ |
320 | int init_per_cpu(int cpunum) | 320 | int __init init_per_cpu(int cpunum) |
321 | { | 321 | { |
322 | int ret; | 322 | int ret; |
323 | struct pdc_coproc_cfg coproc_cfg; | 323 | struct pdc_coproc_cfg coproc_cfg; |
diff --git a/arch/parisc/kernel/setup.c b/arch/parisc/kernel/setup.c index a31e91c1782b..f7d0c3b33d70 100644 --- a/arch/parisc/kernel/setup.c +++ b/arch/parisc/kernel/setup.c | |||
@@ -49,6 +49,7 @@ | |||
49 | #include <asm/io.h> | 49 | #include <asm/io.h> |
50 | #include <asm/setup.h> | 50 | #include <asm/setup.h> |
51 | #include <asm/unwind.h> | 51 | #include <asm/unwind.h> |
52 | #include <asm/smp.h> | ||
52 | 53 | ||
53 | static char __initdata command_line[COMMAND_LINE_SIZE]; | 54 | static char __initdata command_line[COMMAND_LINE_SIZE]; |
54 | 55 | ||
@@ -116,7 +117,6 @@ void __init dma_ops_init(void) | |||
116 | } | 117 | } |
117 | #endif | 118 | #endif |
118 | 119 | ||
119 | extern int init_per_cpu(int cpuid); | ||
120 | extern void collect_boot_cpu_data(void); | 120 | extern void collect_boot_cpu_data(void); |
121 | 121 | ||
122 | void __init setup_arch(char **cmdline_p) | 122 | void __init setup_arch(char **cmdline_p) |
diff --git a/arch/parisc/kernel/smp.c b/arch/parisc/kernel/smp.c index 63365106ea19..30c28ab14540 100644 --- a/arch/parisc/kernel/smp.c +++ b/arch/parisc/kernel/smp.c | |||
@@ -255,12 +255,11 @@ void arch_send_call_function_single_ipi(int cpu) | |||
255 | static void __init | 255 | static void __init |
256 | smp_cpu_init(int cpunum) | 256 | smp_cpu_init(int cpunum) |
257 | { | 257 | { |
258 | extern int init_per_cpu(int); /* arch/parisc/kernel/processor.c */ | ||
259 | extern void init_IRQ(void); /* arch/parisc/kernel/irq.c */ | 258 | extern void init_IRQ(void); /* arch/parisc/kernel/irq.c */ |
260 | extern void start_cpu_itimer(void); /* arch/parisc/kernel/time.c */ | 259 | extern void start_cpu_itimer(void); /* arch/parisc/kernel/time.c */ |
261 | 260 | ||
262 | /* Set modes and Enable floating point coprocessor */ | 261 | /* Set modes and Enable floating point coprocessor */ |
263 | (void) init_per_cpu(cpunum); | 262 | init_per_cpu(cpunum); |
264 | 263 | ||
265 | disable_sr_hashing(); | 264 | disable_sr_hashing(); |
266 | 265 | ||