Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2739e8cf authored by David Gibson's avatar David Gibson Committed by Paul Mackerras
Browse files

[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: default avatarDavid Gibson <dwg@au1.ibm.com>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent b74d0bd5

arch/ppc64/kernel/head.S

+10 −1
Original line number Original line Diff line number Diff line
@@ -1269,7 +1269,16 @@ initial_stab: 
	.= 0x7000

	.= 0x7000

	.globl fwnmi_data_area

	.globl fwnmi_data_area

fwnmi_data_area:

fwnmi_data_area:

	.space	PAGE_SIZE



	/* 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

	 * both pSeries and iSeries */

#ifdef CONFIG_PPC_ISERIES

        . = LPARMAP_PHYS

#include "lparmap.s"

#endif /* CONFIG_PPC_ISERIES */



        . = 0x8000





/*

/*

 * On pSeries, secondary processors spin in the following code.

 * On pSeries, secondary processors spin in the following code.