Re: round2 [PATCH 4/6] Undefine srmmu_hwprobe in the CONFIG_SPARC_LEON case. The sparc-leon SRMMU has no mmu probe logic implemented. Instead function srmmu_swprobe() is used that is defined in arch/sparc/mm/leon.c. arch/sparc/include/asm/leon.h on the other hand defines srmmu_hwprobe(addr) as a macro

[Sam Ravnborg <sam@xxxxxxxxxxxx>]

On Fri, Jun 12, 2009 at 10:44:15AM +0200, konrad@xxxxxxxxxxx wrote:
> From: Konrad Eisele <konrad@xxxxxxxxxxx>
> 
> ---
>  arch/sparc/include/asm/pgtsrmmu.h |    2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-)
> 
> diff --git a/arch/sparc/include/asm/pgtsrmmu.h b/arch/sparc/include/asm/pgtsrmmu.h
> index 808555f..267178c 100644
> --- a/arch/sparc/include/asm/pgtsrmmu.h
> +++ b/arch/sparc/include/asm/pgtsrmmu.h
> @@ -267,6 +267,7 @@ static inline void srmmu_flush_tlb_page(unsigned long page)
>  
>  }
>  
> +#ifndef CONFIG_SPARC_LEON
>  static inline unsigned long srmmu_hwprobe(unsigned long vaddr)
>  {
>  	unsigned long retval;
> @@ -278,6 +279,7 @@ static inline unsigned long srmmu_hwprobe(unsigned long vaddr)
>  
>  	return retval;
>  }
> +#endif

In leon.h we have:
#define srmmu_hwprobe(addr) (srmmu_swprobe(addr, 0) & SRMMU_PTE_PMASK)

It is much more obvious if we define srmmu_hwprobe in one place.
Move the redefinition of srmmu_hwprobe here.

	Sam
--
To unsubscribe from this list: send the line "unsubscribe sparclinux" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html