[PATCH 03/13] powerpc: Fix booke hugetlb preload code for PPC_MM_SLICES and 64-bit

Benjamin Herrenschmidt benh at kernel.crashing.org
Tue Nov 29 09:50:37 EST 2011


> 	return;
>  
>  #ifdef CONFIG_PPC_MM_SLICES
> -	psize = mmu_get_tsize(get_slice_psize(mm, ea));
> -	tsize = mmu_get_psize(psize);
> +	psize = get_slice_psize(mm, ea);
> +	tsize = mmu_get_tsize(psize);
>  	shift = mmu_psize_defs[psize].shift;
>  #else
> -	vma = find_vma(mm, ea);
> -	psize = vma_mmu_pagesize(vma);	/* returns actual size in bytes */
> -	asm (PPC_CNTLZL "%0,%1" : "=r" (lz) : "r" (psize));
> -	shift = 31 - lz;
> -	tsize = 21 - lz;
> +	psize = vma_mmu_pagesize(find_vma(mm, ea));
> +	shift = __ilog2(psize);
> +	tsize = shift - 10;
>  #endif
>  

BTW. Can you remind me what is the business with slices vs. no slices on
Book3E ?

I'd like to avoid having to build separate kernels for A2 vs. FSL ... 

Cheers,
Ben.




More information about the Linuxppc-dev mailing list