diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-10-24 18:04:01 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-10-24 18:04:01 -0400 |
| commit | 552a79413a691a09abf1b3707561858422afc53c (patch) | |
| tree | e38e1a15cf25fcb240414237209d3fc5a28944d4 /arch/sparc/mm/leon_mm.c | |
| parent | d30d9cf39c522f3aa767015e5b6d3d18b4414137 (diff) | |
| parent | c3b92c8787367a8bb53d57d9789b558f1295cc96 (diff) | |
Merge commit 'v3.1' into linaro-3.1
Diffstat (limited to 'arch/sparc/mm/leon_mm.c')
| -rw-r--r-- | arch/sparc/mm/leon_mm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/mm/leon_mm.c b/arch/sparc/mm/leon_mm.c index e485a680499..13c2169822a 100644 --- a/arch/sparc/mm/leon_mm.c +++ b/arch/sparc/mm/leon_mm.c @@ -162,7 +162,7 @@ ready: printk(KERN_INFO "swprobe: padde %x\n", paddr_calc); if (paddr) *paddr = paddr_calc; - return paddrbase; + return pte; } void leon_flush_icache_all(void) |