| Message ID | 20170711112626.17094-1-msuchanek@suse.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | bf751e30b41cdf2568cccaf5de4156a3d78683df |
| Headers | show |
On Tue, 2017-07-11 at 11:26:26 UTC, Michal Suchanek wrote: > In commit e6f81a92015b ("powerpc/mm/hash: Support 68 bit VA") the > masking is folded into ASM_VSID_SCRAMBLE but the comment about masking > is removed only from the firt use of ASM_VSID_SCRAMBLE. > > Signed-off-by: Michal Suchanek <msuchanek@suse.de> Applied to powerpc next, thanks. https://git.kernel.org/powerpc/c/bf751e30b41cdf2568cccaf5de4156 cheers
diff --git a/arch/powerpc/mm/slb_low.S b/arch/powerpc/mm/slb_low.S index bde378559d01..8e95e01b9e8e 100644 --- a/arch/powerpc/mm/slb_low.S +++ b/arch/powerpc/mm/slb_low.S @@ -296,10 +296,6 @@ slb_compare_rr_to_size: srdi r10,r10,(SID_SHIFT_1T - SID_SHIFT) /* get 1T ESID */ rldimi r10,r9,ESID_BITS_1T,0 ASM_VSID_SCRAMBLE(r10,r9,r11,1T) - /* - * bits above VSID_BITS_1T need to be ignored from r10 - * also combine VSID and flags - */ li r10,MMU_SEGSIZE_1T rldimi r11,r10,SLB_VSID_SSIZE_SHIFT,0 /* insert segment size */
In commit e6f81a92015b ("powerpc/mm/hash: Support 68 bit VA") the masking is folded into ASM_VSID_SCRAMBLE but the comment about masking is removed only from the firt use of ASM_VSID_SCRAMBLE. Signed-off-by: Michal Suchanek <msuchanek@suse.de> --- arch/powerpc/mm/slb_low.S | 4 ---- 1 file changed, 4 deletions(-)