From 93d982ed55ae6f81a06329524fbfdf0fec4d9d1e Mon Sep 17 00:00:00 2001
From: Konrad Eisele <konrad@xxxxxxxxxxx>
Date: Tue, 9 Jun 2009 12:59:42 +0200
Subject: [PATCH 4/7] Undefine srmmu_hwprobe in the CONFIG_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
Signed-off-by: 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..1701181 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(
}
+#if !(defined(CONFIG_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
>From 93d982ed55ae6f81a06329524fbfdf0fec4d9d1e Mon Sep 17 00:00:00 2001
From: Konrad Eisele <konrad@xxxxxxxxxxx>
Date: Tue, 9 Jun 2009 12:59:42 +0200
Subject: [PATCH 4/7] Undefine srmmu_hwprobe in the CONFIG_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
Signed-off-by: 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..1701181 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(
}
+#if !(defined(CONFIG_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
