Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d649bd7b authored by Ishizaki Kou's avatar Ishizaki Kou Committed by Paul Mackerras
Browse files

[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: default avatarKou Ishizaki <kou.ishizaki@toshiba.co.jp>
Acked-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 3650cfe2

arch/powerpc/mm/hugetlbpage.c

+1 −2
Original line number Diff line number Diff line
@@ -1014,7 +1014,6 @@ int hash_huge_page(struct mm_struct *mm, unsigned long access, 


		/* 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 @@ int hash_huge_page(struct mm_struct *mm, unsigned long access, 
		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);

	}



	/*