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

[PATCH] Restore lparmap.s include for iSeries

A mistake rebasing the series of ppc64 head.S cleanup patches meant
the #include of lparmap.s, needed for iSeries was lost. This patch
puts it back again.

Signed-off-by: David Gibson <dwg@au1.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>

authored by

David Gibson and committed by
Paul Mackerras 2739e8cf b74d0bd5

+10 -1
unified split
+10 -1
arch/ppc64/kernel/head.S
··· 1269 .= 0x7000 1270 .globl fwnmi_data_area 1271 fwnmi_data_area: 1272 - .space PAGE_SIZE 1273 1274 /* 1275 * On pSeries, secondary processors spin in the following code.
··· 1269 .= 0x7000 1270 .globl fwnmi_data_area 1271 fwnmi_data_area: 1272 + 1273 + /* iSeries does not use the FWNMI stuff, so it is safe to put 1274 + * this here, even if we later allow kernels that will boot on 1275 + * both pSeries and iSeries */ 1276 + #ifdef CONFIG_PPC_ISERIES 1277 + . = LPARMAP_PHYS 1278 + #include "lparmap.s" 1279 + #endif /* CONFIG_PPC_ISERIES */ 1280 + 1281 + . = 0x8000 1282 1283 /* 1284 * On pSeries, secondary processors spin in the following code.