diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2007-08-20 14:58:36 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-08-22 15:21:46 +1000 |
| commit | 16a15a30f8a09af6ce2dc4fd6eec9b454c1fe488 (patch) | |
| tree | b9a2be9818f41d92df001950374ed6bc49e44751 /include/asm-powerpc/iseries | |
| parent | 556ecf9be66f4d493e19bc71a7ce84366d512b71 (diff) | |
| download | blackbird-op-linux-16a15a30f8a09af6ce2dc4fd6eec9b454c1fe488.tar.gz blackbird-op-linux-16a15a30f8a09af6ce2dc4fd6eec9b454c1fe488.zip | |
[POWERPC] iSeries: Clean up lparmap mess
We need to have xLparMap in head_64.S so that it is at a fixed address
(because the linker will not resolve (address & 0xffffffff) for us).
But the assembler miscalculates the KERNEL_VSID() expressions. So put
the confusing expressions into asm-offsets.c.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'include/asm-powerpc/iseries')
| -rw-r--r-- | include/asm-powerpc/iseries/lpar_map.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/asm-powerpc/iseries/lpar_map.h b/include/asm-powerpc/iseries/lpar_map.h index 2ec384d66abb..5e9f3e128ee2 100644 --- a/include/asm-powerpc/iseries/lpar_map.h +++ b/include/asm-powerpc/iseries/lpar_map.h @@ -22,6 +22,8 @@ #include <asm/types.h> +#endif + /* * The iSeries hypervisor will set up mapping for one or more * ESID/VSID pairs (in SLB/segment registers) and will set up @@ -56,6 +58,7 @@ /* Hypervisor initially maps 32MB of the load area */ #define HvPagesToMap 8192 +#ifndef __ASSEMBLY__ struct LparMap { u64 xNumberEsids; // Number of ESID/VSID pairs u64 xNumberRanges; // Number of VA ranges to map |
