From: David Gibson <david@gibson.dropbear.id.au>
Date: Tue, 30 Aug 2005 02:54:07 +0000 (+1000)
Subject: [PATCH] Restore lparmap.s include for iSeries
X-Git-Tag: v2.6.14-rc1~1034^2~14
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=2739e8cf113ce6e931608986a28bab5a42c0acd9;p=linux-2.6-omap-h63xx.git

[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>
---

diff --git a/arch/ppc64/kernel/head.S b/arch/ppc64/kernel/head.S
index cccec490264..d98a9986c14 100644
--- a/arch/ppc64/kernel/head.S
+++ b/arch/ppc64/kernel/head.S
@@ -1269,7 +1269,16 @@ initial_stab:
 	.= 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.