diff options
| author | David Gibson <david@gibson.dropbear.id.au> | 2005-08-30 12:54:07 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-08-30 12:59:48 +1000 |
| commit | 2739e8cf113ce6e931608986a28bab5a42c0acd9 (patch) | |
| tree | 264d88ebd4399ec49f882560ea655f93b8bbc095 /arch | |
| parent | b74d0bd53406c23636707565d87ddaa55d315b26 (diff) | |
| download | linux-stable-2739e8cf113ce6e931608986a28bab5a42c0acd9.tar.gz linux-stable-2739e8cf113ce6e931608986a28bab5a42c0acd9.tar.bz2 linux-stable-2739e8cf113ce6e931608986a28bab5a42c0acd9.zip | |
[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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/ppc64/kernel/head.S | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/arch/ppc64/kernel/head.S b/arch/ppc64/kernel/head.S index cccec4902646..d98a9986c14f 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. |