[PATCH] Restore lparmap.s include for iSeries
authorDavid Gibson <david@gibson.dropbear.id.au>
Tue, 30 Aug 2005 02:54:07 +0000 (12:54 +1000)
committerPaul Mackerras <paulus@samba.org>
Tue, 30 Aug 2005 02:59:48 +0000 (12:59 +1000)
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>
arch/ppc64/kernel/head.S

index cccec4902646257de32257ccadc433a4a2ebe0c3..d98a9986c14f02dea86f04f2e6c05f7390083ee2 100644 (file)
@@ -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.