diff options
Diffstat (limited to 'arch/powerpc/platforms/ps3/htab.c')
-rw-r--r-- | arch/powerpc/platforms/ps3/htab.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/powerpc/platforms/ps3/htab.c b/arch/powerpc/platforms/ps3/htab.c index 6cc58201db8c..177a2f70700c 100644 --- a/arch/powerpc/platforms/ps3/htab.c +++ b/arch/powerpc/platforms/ps3/htab.c | |||
@@ -46,7 +46,7 @@ static DEFINE_SPINLOCK(ps3_htab_lock); | |||
46 | 46 | ||
47 | static long ps3_hpte_insert(unsigned long hpte_group, unsigned long vpn, | 47 | static long ps3_hpte_insert(unsigned long hpte_group, unsigned long vpn, |
48 | unsigned long pa, unsigned long rflags, unsigned long vflags, | 48 | unsigned long pa, unsigned long rflags, unsigned long vflags, |
49 | int psize, int ssize) | 49 | int psize, int apsize, int ssize) |
50 | { | 50 | { |
51 | int result; | 51 | int result; |
52 | u64 hpte_v, hpte_r; | 52 | u64 hpte_v, hpte_r; |
@@ -62,8 +62,8 @@ static long ps3_hpte_insert(unsigned long hpte_group, unsigned long vpn, | |||
62 | */ | 62 | */ |
63 | vflags &= ~HPTE_V_SECONDARY; | 63 | vflags &= ~HPTE_V_SECONDARY; |
64 | 64 | ||
65 | hpte_v = hpte_encode_v(vpn, psize, ssize) | vflags | HPTE_V_VALID; | 65 | hpte_v = hpte_encode_v(vpn, psize, apsize, ssize) | vflags | HPTE_V_VALID; |
66 | hpte_r = hpte_encode_r(ps3_mm_phys_to_lpar(pa), psize) | rflags; | 66 | hpte_r = hpte_encode_r(ps3_mm_phys_to_lpar(pa), psize, apsize) | rflags; |
67 | 67 | ||
68 | spin_lock_irqsave(&ps3_htab_lock, flags); | 68 | spin_lock_irqsave(&ps3_htab_lock, flags); |
69 | 69 | ||
@@ -117,7 +117,7 @@ static long ps3_hpte_updatepp(unsigned long slot, unsigned long newpp, | |||
117 | unsigned long flags; | 117 | unsigned long flags; |
118 | long ret; | 118 | long ret; |
119 | 119 | ||
120 | want_v = hpte_encode_v(vpn, psize, ssize); | 120 | want_v = hpte_encode_avpn(vpn, psize, ssize); |
121 | 121 | ||
122 | spin_lock_irqsave(&ps3_htab_lock, flags); | 122 | spin_lock_irqsave(&ps3_htab_lock, flags); |
123 | 123 | ||