diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-19 04:14:39 +0200 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-19 04:14:39 +0200 |
| commit | a3bc068022b968a3042b48eb9a8e8b0418fb9cdd (patch) | |
| tree | 6bbc2806756924105802f4584157396fb98d282c /arch/ppc64/kernel/head.S | |
| parent | [PATCH] skge: turn on link status LED (diff) | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6 (diff) | |
| download | linux-a3bc068022b968a3042b48eb9a8e8b0418fb9cdd.tar.xz linux-a3bc068022b968a3042b48eb9a8e8b0418fb9cdd.zip | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'arch/ppc64/kernel/head.S')
| -rw-r--r-- | arch/ppc64/kernel/head.S | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/ppc64/kernel/head.S b/arch/ppc64/kernel/head.S index 784f56d4684c..accaa052d31f 100644 --- a/arch/ppc64/kernel/head.S +++ b/arch/ppc64/kernel/head.S @@ -38,6 +38,7 @@ #include <asm/cputable.h> #include <asm/setup.h> #include <asm/hvcall.h> +#include <asm/iSeries/LparMap.h> #ifdef CONFIG_PPC_ISERIES #define DO_SOFT_DISABLE @@ -679,6 +680,11 @@ hardware_interrupt_iSeries_masked: .globl fwnmi_data_area fwnmi_data_area: +#ifdef CONFIG_PPC_ISERIES + . = LPARMAP_PHYS +#include "lparmap.s" +#endif /* CONFIG_PPC_ISERIES */ + /* * Vectors for the FWNMI option. Share common code. */ |