Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[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: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>

authored by

Stephen Rothwell and committed by
Paul Mackerras
9e4859ef ee7a76da

+9
+2
arch/powerpc/kernel/crash_dump.c
··· 54 54 create_trampoline(i); 55 55 } 56 56 57 + #ifdef CONFIG_PPC_PSERIES 57 58 create_trampoline(__pa(system_reset_fwnmi) - PHYSICAL_START); 58 59 create_trampoline(__pa(machine_check_fwnmi) - PHYSICAL_START); 60 + #endif /* CONFIG_PPC_PSERIES */ 59 61 60 62 DBG(" <- setup_kdump_trampoline()\n"); 61 63 }
+7
arch/powerpc/kernel/head_64.S
··· 341 341 b . /* prevent spec. execution */ 342 342 #endif /* __DISABLED__ */ 343 343 344 + #ifdef CONFIG_PPC_PSERIES 344 345 /* 345 346 * Vectors for the FWNMI option. Share common code. 346 347 */ ··· 358 357 HMT_MEDIUM 359 358 mtspr SPRN_SPRG1,r13 /* save r13 */ 360 359 EXCEPTION_PROLOG_PSERIES_FORCE_64BIT(PACA_EXMC, machine_check_common) 360 + 361 + #endif /* CONFIG_PPC_PSERIES */ 361 362 362 363 /*** Common interrupt handlers ***/ 363 364 ··· 1015 1012 initial_stab: 1016 1013 .space 4096 1017 1014 1015 + #ifdef CONFIG_PPC_PSERIES 1018 1016 /* 1019 1017 * Data area reserved for FWNMI option. 1020 1018 * This address (0x7000) is fixed by the RPA. ··· 1023 1019 .= 0x7000 1024 1020 .globl fwnmi_data_area 1025 1021 fwnmi_data_area: 1022 + #endif /* CONFIG_PPC_PSERIES */ 1026 1023 1027 1024 /* iSeries does not use the FWNMI stuff, so it is safe to put 1028 1025 * this here, even if we later allow kernels that will boot on ··· 1048 1043 1049 1044 #endif /* CONFIG_PPC_ISERIES */ 1050 1045 1046 + #ifdef CONFIG_PPC_PSERIES 1051 1047 . = 0x8000 1048 + #endif /* CONFIG_PPC_PSERIES */ 1052 1049 1053 1050 /* 1054 1051 * On pSeries and most other platforms, secondary processors spin