Commit 9e4859ef authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Paul Mackerras

[POWERPC] FWNMI is only used on pSeries

This saves 4k on non pSeries builds (except for iSeries where it saves
almost 4k).
Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent ee7a76da
...@@ -54,8 +54,10 @@ void __init setup_kdump_trampoline(void) ...@@ -54,8 +54,10 @@ void __init setup_kdump_trampoline(void)
create_trampoline(i); create_trampoline(i);
} }
#ifdef CONFIG_PPC_PSERIES
create_trampoline(__pa(system_reset_fwnmi) - PHYSICAL_START); create_trampoline(__pa(system_reset_fwnmi) - PHYSICAL_START);
create_trampoline(__pa(machine_check_fwnmi) - PHYSICAL_START); create_trampoline(__pa(machine_check_fwnmi) - PHYSICAL_START);
#endif /* CONFIG_PPC_PSERIES */
DBG(" <- setup_kdump_trampoline()\n"); DBG(" <- setup_kdump_trampoline()\n");
} }
......
...@@ -341,6 +341,7 @@ slb_miss_user_pseries: ...@@ -341,6 +341,7 @@ slb_miss_user_pseries:
b . /* prevent spec. execution */ b . /* prevent spec. execution */
#endif /* __DISABLED__ */ #endif /* __DISABLED__ */
#ifdef CONFIG_PPC_PSERIES
/* /*
* Vectors for the FWNMI option. Share common code. * Vectors for the FWNMI option. Share common code.
*/ */
...@@ -358,6 +359,8 @@ machine_check_fwnmi: ...@@ -358,6 +359,8 @@ machine_check_fwnmi:
mtspr SPRN_SPRG1,r13 /* save r13 */ mtspr SPRN_SPRG1,r13 /* save r13 */
EXCEPTION_PROLOG_PSERIES_FORCE_64BIT(PACA_EXMC, machine_check_common) EXCEPTION_PROLOG_PSERIES_FORCE_64BIT(PACA_EXMC, machine_check_common)
#endif /* CONFIG_PPC_PSERIES */
/*** Common interrupt handlers ***/ /*** Common interrupt handlers ***/
STD_EXCEPTION_COMMON(0x100, system_reset, .system_reset_exception) STD_EXCEPTION_COMMON(0x100, system_reset, .system_reset_exception)
...@@ -1012,6 +1015,7 @@ _GLOBAL(do_stab_bolted) ...@@ -1012,6 +1015,7 @@ _GLOBAL(do_stab_bolted)
initial_stab: initial_stab:
.space 4096 .space 4096
#ifdef CONFIG_PPC_PSERIES
/* /*
* Data area reserved for FWNMI option. * Data area reserved for FWNMI option.
* This address (0x7000) is fixed by the RPA. * This address (0x7000) is fixed by the RPA.
...@@ -1019,6 +1023,7 @@ initial_stab: ...@@ -1019,6 +1023,7 @@ initial_stab:
.= 0x7000 .= 0x7000
.globl fwnmi_data_area .globl fwnmi_data_area
fwnmi_data_area: fwnmi_data_area:
#endif /* CONFIG_PPC_PSERIES */
/* iSeries does not use the FWNMI stuff, so it is safe to put /* iSeries does not use the FWNMI stuff, so it is safe to put
* this here, even if we later allow kernels that will boot on * this here, even if we later allow kernels that will boot on
...@@ -1043,7 +1048,9 @@ xLparMap: ...@@ -1043,7 +1048,9 @@ xLparMap:
#endif /* CONFIG_PPC_ISERIES */ #endif /* CONFIG_PPC_ISERIES */
#ifdef CONFIG_PPC_PSERIES
. = 0x8000 . = 0x8000
#endif /* CONFIG_PPC_PSERIES */
/* /*
* On pSeries and most other platforms, secondary processors spin * On pSeries and most other platforms, secondary processors spin
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment