diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-11-07 12:05:22 -0500 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-11-07 12:05:22 -0500 |
| commit | 0ad3a96f8ad910ecf87a25ec69ed360b284dee2e (patch) | |
| tree | 12d292fd58fc0f7a3eb56c89dfc23569f3ab6c00 /arch/powerpc/kernel/lparmap.c | |
| parent | f79b348856fbaf77e4a0c5cb08a808e5879967a9 (diff) | |
| parent | 5b2f7ffcb734d3046144dfbd5ac6d76254a9e522 (diff) | |
Auto-update from upstream
Diffstat (limited to 'arch/powerpc/kernel/lparmap.c')
| -rw-r--r-- | arch/powerpc/kernel/lparmap.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/lparmap.c b/arch/powerpc/kernel/lparmap.c index b81de286df5e..5a05a797485f 100644 --- a/arch/powerpc/kernel/lparmap.c +++ b/arch/powerpc/kernel/lparmap.c | |||
| @@ -8,7 +8,7 @@ | |||
| 8 | */ | 8 | */ |
| 9 | #include <asm/mmu.h> | 9 | #include <asm/mmu.h> |
| 10 | #include <asm/page.h> | 10 | #include <asm/page.h> |
| 11 | #include <asm/iSeries/LparMap.h> | 11 | #include <asm/iseries/lpar_map.h> |
| 12 | 12 | ||
| 13 | const struct LparMap __attribute__((__section__(".text"))) xLparMap = { | 13 | const struct LparMap __attribute__((__section__(".text"))) xLparMap = { |
| 14 | .xNumberEsids = HvEsidsToMap, | 14 | .xNumberEsids = HvEsidsToMap, |
| @@ -25,7 +25,7 @@ const struct LparMap __attribute__((__section__(".text"))) xLparMap = { | |||
| 25 | .xRanges = { | 25 | .xRanges = { |
| 26 | { .xPages = HvPagesToMap, | 26 | { .xPages = HvPagesToMap, |
| 27 | .xOffset = 0, | 27 | .xOffset = 0, |
| 28 | .xVPN = KERNEL_VSID(KERNELBASE) << (SID_SHIFT - PAGE_SHIFT), | 28 | .xVPN = KERNEL_VSID(KERNELBASE) << (SID_SHIFT - HW_PAGE_SHIFT), |
| 29 | }, | 29 | }, |
| 30 | }, | 30 | }, |
| 31 | }; | 31 | }; |