leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

powerpc/mm: Remove pte_val usage for the second half of pgtable_t

Browse Source 
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
Aneesh Kumar K.V 2015-12-01 09:06:46 +05:30 committed by Michael Ellerman
parent bf680d5160
commit 506b863c68
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/powerpc/include/asm/book3s/64/hash-64k.h
View File

@ -61,6 +61,7 @@
static inline real_pte_t __real_pte(pte_t pte, pte_t *ptep) static inline real_pte_t __real_pte(pte_t pte, pte_t *ptep)
{ {
real_pte_t rpte; real_pte_t rpte;
unsigned long *hidxp;
rpte.pte = pte; rpte.pte = pte;
rpte.hidx = 0; rpte.hidx = 0;
@ -70,7 +71,8 @@ static inline real_pte_t __real_pte(pte_t pte, pte_t *ptep)
* check. The store side ordering is done in __hash_page_4K * check. The store side ordering is done in __hash_page_4K
*/ */
smp_rmb(); smp_rmb();
rpte.hidx = pte_val(*((ptep) + PTRS_PER_PTE)); hidxp = (unsigned long *)(ptep + PTRS_PER_PTE);
rpte.hidx = *hidxp;
} }
return rpte; return rpte;
} }

1
arch/powerpc/mm/hash64_64k.c
View File

@ -218,7 +218,6 @@ repeat:
* nobody is undating hidx. * nobody is undating hidx.
*/ */
hidxp = (unsigned long *)(ptep + PTRS_PER_PTE); hidxp = (unsigned long *)(ptep + PTRS_PER_PTE);
/* __real_pte use pte_val() any idea why ? FIXME!! */
rpte.hidx &= ~(0xfUL << (subpg_index << 2)); rpte.hidx &= ~(0xfUL << (subpg_index << 2));
*hidxp = rpte.hidx | (slot << (subpg_index << 2)); *hidxp = rpte.hidx | (slot << (subpg_index << 2));
new_pte = mark_subptegroup_valid(new_pte, subpg_index); new_pte = mark_subptegroup_valid(new_pte, subpg_index);