From: Konrad Eisele <konrad@xxxxxxxxxxx> >> srmmu_get_pte (unsigned long addr) > > Surely there is a better way to do this, oh and if this is the only > way, #ifndef CONFIG_LEON is much cleaner. > SPARC-LEON doesnt have a hardware probe, so the function cannot be used for leon. I implement a softwareprobe instead. Changed to #ifndef CONFIG_LEON 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 --- 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( } +#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_hwprob return retval; } +#endif static inline int srmmu_get_pte (unsigned long addr) -- 1.4.2.1 -- 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