diff options
| author | Ishizaki Kou <kou.ishizaki@toshiba.co.jp> | 2007-01-12 09:54:39 +0900 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-01-24 21:13:59 +1100 |
| commit | d649bd7b766b9c15c9f5f2f6d8ae0e57303285d0 (patch) | |
| tree | 1041187b9fc76cbf188c68ff87b77aeec45cb1c9 | |
| parent | 3650cfe2e51432030e469afd75a429c199c4e42f (diff) | |
| download | op-kernel-dev-d649bd7b766b9c15c9f5f2f6d8ae0e57303285d0.zip op-kernel-dev-d649bd7b766b9c15c9f5f2f6d8ae0e57303285d0.tar.gz | |
[POWERPC] TLB insertion cleanup
This patch changes handling return value of ppc_md.hpte_insert() into
the same way as __hash_page_*().
Signed-off-by: Kou Ishizaki <kou.ishizaki@toshiba.co.jp>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
| -rw-r--r-- | arch/powerpc/mm/hugetlbpage.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/powerpc/mm/hugetlbpage.c b/arch/powerpc/mm/hugetlbpage.c index 1bb20d8..8c77c79 100644 --- a/arch/powerpc/mm/hugetlbpage.c +++ b/arch/powerpc/mm/hugetlbpage.c @@ -1014,7 +1014,6 @@ repeat: /* Primary is full, try the secondary */ if (unlikely(slot == -1)) { - new_pte |= _PAGE_F_SECOND; hpte_group = ((~hash & htab_hash_mask) * HPTES_PER_GROUP) & ~0x7UL; slot = ppc_md.hpte_insert(hpte_group, va, pa, rflags, @@ -1033,7 +1032,7 @@ repeat: if (unlikely(slot == -2)) panic("hash_huge_page: pte_insert failed\n"); - new_pte |= (slot << 12) & _PAGE_F_GIX; + new_pte |= (slot << 12) & (_PAGE_F_SECOND | _PAGE_F_GIX); } /* |
