diff options
| author | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-08-19 11:37:59 -0400 |
|---|---|---|
| committer | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-08-19 11:37:59 -0400 |
| commit | 01fa90cb2f0b664bc86d9aff807f4ea7f09e2e7f (patch) | |
| tree | 5c290dcd84389e8a5bacc052bf61ea89ac02a4fb /arch/ppc64/kernel/head.S | |
| parent | 686762c8049457a6255ad5caf9275c100fbaceb6 (diff) | |
| parent | 2ad56496627630ebc99f06af5f81ca23e17e014e (diff) | |
Merge with /home/shaggy/git/linus-clean/
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 784f56d4684..accaa052d31 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 | */ |