[PATCH] Restore lparmap.s include for iSeries

David Gibson david at gibson.dropbear.id.au
Tue Aug 30 12:54:07 EST 2005


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 at au1.ibm.com>
---

 arch/ppc64/kernel/head.S |   11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

Index: working-2.6/arch/ppc64/kernel/head.S
===================================================================
--- working-2.6.orig/arch/ppc64/kernel/head.S	2005-08-30 12:41:28.000000000 +1000
+++ working-2.6/arch/ppc64/kernel/head.S	2005-08-30 12:48:16.000000000 +1000
@@ -1269,7 +1269,16 @@
 	.= 0x7000
 	.globl 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.



More information about the Linuxppc64-dev mailing list