diff options
| author | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-08-19 19:37:59 +0400 |
|---|---|---|
| committer | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-08-19 19:37:59 +0400 |
| commit | 01fa90cb2f0b664bc86d9aff807f4ea7f09e2e7f (patch) | |
| tree | 5c290dcd84389e8a5bacc052bf61ea89ac02a4fb /include/asm-ppc64/iSeries/LparMap.h | |
| parent | 686762c8049457a6255ad5caf9275c100fbaceb6 (diff) | |
| parent | 2ad56496627630ebc99f06af5f81ca23e17e014e (diff) | |
| download | linux-01fa90cb2f0b664bc86d9aff807f4ea7f09e2e7f.tar.xz | |
Merge with /home/shaggy/git/linus-clean/
Diffstat (limited to 'include/asm-ppc64/iSeries/LparMap.h')
| -rw-r--r-- | include/asm-ppc64/iSeries/LparMap.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/include/asm-ppc64/iSeries/LparMap.h b/include/asm-ppc64/iSeries/LparMap.h index 5c32e38c1c01..a6840b186d03 100644 --- a/include/asm-ppc64/iSeries/LparMap.h +++ b/include/asm-ppc64/iSeries/LparMap.h @@ -19,6 +19,8 @@ #ifndef _LPARMAP_H #define _LPARMAP_H +#ifndef __ASSEMBLY__ + #include <asm/types.h> /* @@ -71,6 +73,11 @@ struct LparMap { } xRanges[HvRangesToMap]; }; -extern struct LparMap xLparMap; +extern const struct LparMap xLparMap; + +#endif /* __ASSEMBLY__ */ + +/* the fixed address where the LparMap exists */ +#define LPARMAP_PHYS 0x7000 #endif /* _LPARMAP_H */ |