[PATCH 15/16] TLB insersion for Celleb

[Benjamin Herrenschmidt]

On Wed, 2006-11-15 at 19:00 +0900, Ishizaki Kou wrote:
> This patch changes handling return value of ppc_md.hpte_insert() to 
> the same way as __hash_page_*().
> 
> Signed-off-by: Kou Ishizaki <kou.ishizaki at toshiba.co.jp>

Acked-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>

> ---
> 
> Index: linux-2.6.19/arch/powerpc/mm/hugetlbpage.c
> diff -u linux-2.6.19/arch/powerpc/mm/hugetlbpage.c:1.1.1.1 linux-2.6.19/arch/powerpc/mm/hugetlbpage.c:1.2
> --- linux-2.6.19/arch/powerpc/mm/hugetlbpage.c:1.1.1.1	Fri Oct  6 10:40:06 2006
> +++ linux-2.6.19/arch/powerpc/mm/hugetlbpage.c	Wed Oct 11 20:45:10 2006
> @@ -1008,7 +1008,6 @@
>  
>  		/* 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,
> @@ -1027,7 +1026,7 @@
>  		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);
>  	}
>  
>  	/*
> _______________________________________________
> Linuxppc-dev mailing list
> Linuxppc-dev at ozlabs.org
> https://ozlabs.org/mailman/listinfo/linuxppc-dev