diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-10-24 17:03:35 +0200 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-10-24 17:03:35 +0200 |
| commit | 2bf6f675fa1a0f80b21aff20e6c21e87d6a7c9c9 (patch) | |
| tree | ef49d741211dcc4f38636b5c422c9c346da09adf /arch/sparc/mm/leon_mm.c | |
| parent | dt: Add empty of_match_node() macro (diff) | |
| parent | Linux 3.1 (diff) | |
| download | linux-2bf6f675fa1a0f80b21aff20e6c21e87d6a7c9c9.tar.xz linux-2bf6f675fa1a0f80b21aff20e6c21e87d6a7c9c9.zip | |
Merge commit 'v3.1' into devicetree/next
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 e485a6804998..13c2169822a8 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) |