diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-08-17 09:37:55 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-08-17 09:37:55 -0400 |
| commit | 327b6b08d6ab3bf5488120ba02ed2fe06b09efe6 (patch) | |
| tree | 592b0ebc2f5f18dac0bdc0fd6ba87d2c8b07b232 /arch/ppc64/kernel/head.S | |
| parent | c973b112c76c9d8fd042991128f218a738cc8d0a (diff) | |
| parent | 2ad56496627630ebc99f06af5f81ca23e17e014e (diff) | |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
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 @@ | |||
| 38 | #include <asm/cputable.h> | 38 | #include <asm/cputable.h> |
| 39 | #include <asm/setup.h> | 39 | #include <asm/setup.h> |
| 40 | #include <asm/hvcall.h> | 40 | #include <asm/hvcall.h> |
| 41 | #include <asm/iSeries/LparMap.h> | ||
| 41 | 42 | ||
| 42 | #ifdef CONFIG_PPC_ISERIES | 43 | #ifdef CONFIG_PPC_ISERIES |
| 43 | #define DO_SOFT_DISABLE | 44 | #define DO_SOFT_DISABLE |
| @@ -679,6 +680,11 @@ hardware_interrupt_iSeries_masked: | |||
| 679 | .globl fwnmi_data_area | 680 | .globl fwnmi_data_area |
| 680 | fwnmi_data_area: | 681 | fwnmi_data_area: |
| 681 | 682 | ||
| 683 | #ifdef CONFIG_PPC_ISERIES | ||
| 684 | . = LPARMAP_PHYS | ||
| 685 | #include "lparmap.s" | ||
| 686 | #endif /* CONFIG_PPC_ISERIES */ | ||
| 687 | |||
| 682 | /* | 688 | /* |
| 683 | * Vectors for the FWNMI option. Share common code. | 689 | * Vectors for the FWNMI option. Share common code. |
| 684 | */ | 690 | */ |