diff options
| author | Konrad Eisele <konrad@gaisler.com> | 2009-08-17 02:13:31 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-08-18 03:32:10 +0200 |
| commit | 0fd7ef1fe0e6e70c7851ce65a2eb8a8d3f49147e (patch) | |
| tree | 5acde580b44e055ce38660bd4185f0da2f1f6468 /arch/sparc/include/asm/pgtsrmmu.h | |
| parent | sparc,leon: Redefine MMU register access asi if CONFIG_LEON (diff) | |
| download | linux-0fd7ef1fe0e6e70c7851ce65a2eb8a8d3f49147e.tar.xz linux-0fd7ef1fe0e6e70c7851ce65a2eb8a8d3f49147e.zip | |
sparc,leon: Introduce the sparc-leon CPU type.
Add sparc_leon enum, M_LEON|M_LEON3_SOC machine. Add compilation of
leon.c in mm and kernel
if CONFIG_SPARC_LEON is defined. Add sparc_leon dependent
initialization to switch statements + head.S.
Signed-off-by: Konrad Eisele <konrad@gaisler.com>
Reviewed-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/include/asm/pgtsrmmu.h')
| -rw-r--r-- | arch/sparc/include/asm/pgtsrmmu.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/sparc/include/asm/pgtsrmmu.h b/arch/sparc/include/asm/pgtsrmmu.h index 808555fc1d58..1407c07bdade 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,9 @@ static inline unsigned long srmmu_hwprobe(unsigned long vaddr) return retval; } +#else +#define srmmu_hwprobe(addr) (srmmu_swprobe(addr, 0) & SRMMU_PTE_PMASK) +#endif static inline int srmmu_get_pte (unsigned long addr) |