Undefine srmmu_hwprobe in the CONFIG_LEON case.
PATCH 4/7 Undefine srmmu_hwprobe in the CONFIG_LEON case.
From 93d982ed55ae6f81a06329524fbfdf0fec4d9d1e Mon Sep 17 00:00:00 2001
From: Konrad Eisele <[email protected]>
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
--- arch/sparc/include/asm/pgtsrmmu.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
arch/sparc/include/asm/pgtsrmmu.h +2 -0
@@ -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)
Signature · 1 line
1.4.2.1
From 93d982ed55ae6f81a06329524fbfdf0fec4d9d1e Mon Sep 17 00:00:00 2001
From: Konrad Eisele <[email protected]>
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
--- arch/sparc/include/asm/pgtsrmmu.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
arch/sparc/include/asm/pgtsrmmu.h +2 -0
@@ -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)
Signature · 1 line
1.4.2.1
Quoted 33 lines · Konrad Eisele
From
93d982ed55ae6f81a06329524fbfdf0fec4d9d1eMon Sep 17 00:00:00 2001
From: Konrad Eisele <[email protected]>
Date: Tue, 9 Jun 2009 12:59:42 +0200
Subject: [PATCH 4/7] Undefinesrmmu_hwprobein theCONFIG_LEONcase. The sparc-leon SRMMU has no mmu probe logic implemented. Instead functionsrmmu_swprobe()is used that is defined inarch/sparc/mm/leon.c.arch/sparc/include/asm/leon.hon the other hand definessrmmu_hwprobe(addr)as a macroSigned-off-by Konrad Eisele <[email protected]>---
arch/sparc/include/asm/pgtsrmmu.h | 2 ++1 files changed, 2 insertions(+), 0 deletions(-)arch/sparc/include/asm/pgtsrmmu.h +2
-0@@ -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
Quoted 2 lines
static inline int
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.
Thanks,
Signature · 4 lines
Julian Calaby Email: [email protected] .Plan: http://sites.google.com/site/juliancalaby/
PATCH 4/7 Undefine srmmu_hwprobe in the CONFIG_SPARC_LEON case.
In reply to Konrad EiseleFrom: Konrad Eisele <[email protected]>
Quoted 5 lines
Quoted 1 line
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_LEONis 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(-)
arch/sparc/include/asm/pgtsrmmu.h +2 -0
@@ -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)
Signature · 1 line
1.4.2.1