diff options
| -rw-r--r-- | arch/sparc/include/asm/pgtsrmmu.h | 2 | ||||
| -rw-r--r-- | arch/sparc/mm/leon_mm.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc/include/asm/pgtsrmmu.h b/arch/sparc/include/asm/pgtsrmmu.h index 1407c07bdade..f6ae2b2b6870 100644 --- a/arch/sparc/include/asm/pgtsrmmu.h +++ b/arch/sparc/include/asm/pgtsrmmu.h | |||
| @@ -280,7 +280,7 @@ static inline unsigned long srmmu_hwprobe(unsigned long vaddr) | |||
| 280 | return retval; | 280 | return retval; |
| 281 | } | 281 | } |
| 282 | #else | 282 | #else |
| 283 | #define srmmu_hwprobe(addr) (srmmu_swprobe(addr, 0) & SRMMU_PTE_PMASK) | 283 | #define srmmu_hwprobe(addr) srmmu_swprobe(addr, 0) |
| 284 | #endif | 284 | #endif |
| 285 | 285 | ||
| 286 | static inline int | 286 | static inline int |
diff --git a/arch/sparc/mm/leon_mm.c b/arch/sparc/mm/leon_mm.c index e485a6804998..13c2169822a8 100644 --- a/arch/sparc/mm/leon_mm.c +++ b/arch/sparc/mm/leon_mm.c | |||
| @@ -162,7 +162,7 @@ ready: | |||
| 162 | printk(KERN_INFO "swprobe: padde %x\n", paddr_calc); | 162 | printk(KERN_INFO "swprobe: padde %x\n", paddr_calc); |
| 163 | if (paddr) | 163 | if (paddr) |
| 164 | *paddr = paddr_calc; | 164 | *paddr = paddr_calc; |
| 165 | return paddrbase; | 165 | return pte; |
| 166 | } | 166 | } |
| 167 | 167 | ||
| 168 | void leon_flush_icache_all(void) | 168 | void leon_flush_icache_all(void) |
