diff options
Diffstat (limited to 'arch/powerpc/platforms/ps3/htab.c')
-rw-r--r-- | arch/powerpc/platforms/ps3/htab.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/powerpc/platforms/ps3/htab.c b/arch/powerpc/platforms/ps3/htab.c index a1409e450c70..17414e8d7dd3 100644 --- a/arch/powerpc/platforms/ps3/htab.c +++ b/arch/powerpc/platforms/ps3/htab.c | |||
@@ -34,7 +34,7 @@ | |||
34 | #define DBG(fmt...) do{if(0)printk(fmt);}while(0) | 34 | #define DBG(fmt...) do{if(0)printk(fmt);}while(0) |
35 | #endif | 35 | #endif |
36 | 36 | ||
37 | static hpte_t *htab; | 37 | static struct hash_pte *htab; |
38 | static unsigned long htab_addr; | 38 | static unsigned long htab_addr; |
39 | static unsigned char *bolttab; | 39 | static unsigned char *bolttab; |
40 | static unsigned char *inusetab; | 40 | static unsigned char *inusetab; |
@@ -44,8 +44,8 @@ static DEFINE_SPINLOCK(ps3_bolttab_lock); | |||
44 | #define debug_dump_hpte(_a, _b, _c, _d, _e, _f, _g) \ | 44 | #define debug_dump_hpte(_a, _b, _c, _d, _e, _f, _g) \ |
45 | _debug_dump_hpte(_a, _b, _c, _d, _e, _f, _g, __func__, __LINE__) | 45 | _debug_dump_hpte(_a, _b, _c, _d, _e, _f, _g, __func__, __LINE__) |
46 | static void _debug_dump_hpte(unsigned long pa, unsigned long va, | 46 | static void _debug_dump_hpte(unsigned long pa, unsigned long va, |
47 | unsigned long group, unsigned long bitmap, hpte_t lhpte, int psize, | 47 | unsigned long group, unsigned long bitmap, struct hash_pte lhpte, |
48 | unsigned long slot, const char* func, int line) | 48 | int psize, unsigned long slot, const char* func, int line) |
49 | { | 49 | { |
50 | DBG("%s:%d: pa = %lxh\n", func, line, pa); | 50 | DBG("%s:%d: pa = %lxh\n", func, line, pa); |
51 | DBG("%s:%d: lpar = %lxh\n", func, line, | 51 | DBG("%s:%d: lpar = %lxh\n", func, line, |
@@ -63,7 +63,7 @@ static long ps3_hpte_insert(unsigned long hpte_group, unsigned long va, | |||
63 | unsigned long pa, unsigned long rflags, unsigned long vflags, int psize) | 63 | unsigned long pa, unsigned long rflags, unsigned long vflags, int psize) |
64 | { | 64 | { |
65 | unsigned long slot; | 65 | unsigned long slot; |
66 | hpte_t lhpte; | 66 | struct hash_pte lhpte; |
67 | int secondary = 0; | 67 | int secondary = 0; |
68 | unsigned long result; | 68 | unsigned long result; |
69 | unsigned long bitmap; | 69 | unsigned long bitmap; |
@@ -255,7 +255,7 @@ void __init ps3_hpte_init(unsigned long htab_size) | |||
255 | 255 | ||
256 | ppc64_pft_size = __ilog2(htab_size); | 256 | ppc64_pft_size = __ilog2(htab_size); |
257 | 257 | ||
258 | bitmap_size = htab_size / sizeof(hpte_t) / 8; | 258 | bitmap_size = htab_size / sizeof(struct hash_pte) / 8; |
259 | 259 | ||
260 | bolttab = __va(lmb_alloc(bitmap_size, 1)); | 260 | bolttab = __va(lmb_alloc(bitmap_size, 1)); |
261 | inusetab = __va(lmb_alloc(bitmap_size, 1)); | 261 | inusetab = __va(lmb_alloc(bitmap_size, 1)); |
@@ -273,8 +273,8 @@ void __init ps3_map_htab(void) | |||
273 | 273 | ||
274 | result = lv1_map_htab(0, &htab_addr); | 274 | result = lv1_map_htab(0, &htab_addr); |
275 | 275 | ||
276 | htab = (hpte_t *)__ioremap(htab_addr, htab_size, | 276 | htab = (struct hash_pte *)__ioremap(htab_addr, htab_size, |
277 | pgprot_val(PAGE_READONLY_X)); | 277 | pgprot_val(PAGE_READONLY_X)); |
278 | 278 | ||
279 | DBG("%s:%d: lpar %016lxh, virt %016lxh\n", __func__, __LINE__, | 279 | DBG("%s:%d: lpar %016lxh, virt %016lxh\n", __func__, __LINE__, |
280 | htab_addr, (unsigned long)htab); | 280 | htab_addr, (unsigned long)htab); |