diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-29 21:44:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-29 21:44:33 -0700 |
| commit | 8bc2bee26bc7ba77eb1ffc3e3282002d9893cf09 (patch) | |
| tree | e7c85eca8d55007b0a467b99820820cd40ef4963 /arch/ppc64/kernel/head.S | |
| parent | 826509f8110049663799bc20f2b5b6170e2f78ca (diff) | |
| parent | 8913ca1c9ccb5eb6471afd419159729eef6e2730 (diff) | |
| download | op-kernel-dev-8bc2bee26bc7ba77eb1ffc3e3282002d9893cf09.zip op-kernel-dev-8bc2bee26bc7ba77eb1ffc3e3282002d9893cf09.tar.gz | |
Merge HEAD from master.kernel.org:/pub/scm/linux/kernel/git/paulus/ppc64-2.6
Diffstat (limited to 'arch/ppc64/kernel/head.S')
| -rw-r--r-- | arch/ppc64/kernel/head.S | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/arch/ppc64/kernel/head.S b/arch/ppc64/kernel/head.S index cccec49..0369597 100644 --- a/arch/ppc64/kernel/head.S +++ b/arch/ppc64/kernel/head.S @@ -1269,7 +1269,21 @@ 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" +/* + * This ".text" is here for old compilers that generate a trailing + * .note section when compiling .c files to .s + */ + .text +#endif /* CONFIG_PPC_ISERIES */ + + . = 0x8000 /* * On pSeries, secondary processors spin in the following code. |
