diff options
Diffstat (limited to 'arch/powerpc/platforms')
-rw-r--r-- | arch/powerpc/platforms/pseries/pseries.h | 8 | ||||
-rw-r--r-- | arch/powerpc/platforms/pseries/setup.c | 6 | ||||
-rw-r--r-- | arch/powerpc/platforms/pseries/smp.c | 1 |
3 files changed, 9 insertions, 6 deletions
diff --git a/arch/powerpc/platforms/pseries/pseries.h b/arch/powerpc/platforms/pseries/pseries.h index 37618cb896cb..36c791572682 100644 --- a/arch/powerpc/platforms/pseries/pseries.h +++ b/arch/powerpc/platforms/pseries/pseries.h | |||
@@ -17,4 +17,12 @@ struct pt_regs; | |||
17 | extern int pSeries_system_reset_exception(struct pt_regs *regs); | 17 | extern int pSeries_system_reset_exception(struct pt_regs *regs); |
18 | extern int pSeries_machine_check_exception(struct pt_regs *regs); | 18 | extern int pSeries_machine_check_exception(struct pt_regs *regs); |
19 | 19 | ||
20 | #ifdef CONFIG_SMP | ||
21 | extern void smp_init_pseries_mpic(void); | ||
22 | extern void smp_init_pseries_xics(void); | ||
23 | #else | ||
24 | static inline smp_init_pseries_mpic(void) { }; | ||
25 | static inline smp_init_pseries_xics(void) { }; | ||
26 | #endif | ||
27 | |||
20 | #endif /* _PSERIES_PSERIES_H */ | 28 | #endif /* _PSERIES_PSERIES_H */ |
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c index a28264ce1044..769815680be1 100644 --- a/arch/powerpc/platforms/pseries/setup.c +++ b/arch/powerpc/platforms/pseries/setup.c | |||
@@ -77,8 +77,6 @@ | |||
77 | #endif | 77 | #endif |
78 | 78 | ||
79 | /* move those away to a .h */ | 79 | /* move those away to a .h */ |
80 | extern void smp_init_pseries_mpic(void); | ||
81 | extern void smp_init_pseries_xics(void); | ||
82 | extern void find_udbg_vterm(void); | 80 | extern void find_udbg_vterm(void); |
83 | 81 | ||
84 | int fwnmi_active; /* TRUE if an FWNMI handler is present */ | 82 | int fwnmi_active; /* TRUE if an FWNMI handler is present */ |
@@ -272,18 +270,14 @@ static void __init pseries_discover_pic(void) | |||
272 | #ifdef CONFIG_KEXEC | 270 | #ifdef CONFIG_KEXEC |
273 | ppc_md.kexec_cpu_down = pseries_kexec_cpu_down_mpic; | 271 | ppc_md.kexec_cpu_down = pseries_kexec_cpu_down_mpic; |
274 | #endif | 272 | #endif |
275 | #ifdef CONFIG_SMP | ||
276 | smp_init_pseries_mpic(); | 273 | smp_init_pseries_mpic(); |
277 | #endif | ||
278 | return; | 274 | return; |
279 | } else if (strstr(typep, "ppc-xicp")) { | 275 | } else if (strstr(typep, "ppc-xicp")) { |
280 | ppc_md.init_IRQ = xics_init_IRQ; | 276 | ppc_md.init_IRQ = xics_init_IRQ; |
281 | #ifdef CONFIG_KEXEC | 277 | #ifdef CONFIG_KEXEC |
282 | ppc_md.kexec_cpu_down = pseries_kexec_cpu_down_xics; | 278 | ppc_md.kexec_cpu_down = pseries_kexec_cpu_down_xics; |
283 | #endif | 279 | #endif |
284 | #ifdef CONFIG_SMP | ||
285 | smp_init_pseries_xics(); | 280 | smp_init_pseries_xics(); |
286 | #endif | ||
287 | return; | 281 | return; |
288 | } | 282 | } |
289 | } | 283 | } |
diff --git a/arch/powerpc/platforms/pseries/smp.c b/arch/powerpc/platforms/pseries/smp.c index 4408518eaebe..116305b22a2b 100644 --- a/arch/powerpc/platforms/pseries/smp.c +++ b/arch/powerpc/platforms/pseries/smp.c | |||
@@ -48,6 +48,7 @@ | |||
48 | #include <asm/vdso_datapage.h> | 48 | #include <asm/vdso_datapage.h> |
49 | 49 | ||
50 | #include "plpar_wrappers.h" | 50 | #include "plpar_wrappers.h" |
51 | #include "pseries.h" | ||
51 | 52 | ||
52 | #ifdef DEBUG | 53 | #ifdef DEBUG |
53 | #include <asm/udbg.h> | 54 | #include <asm/udbg.h> |