summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Wilcox <matthew.r.wilcox@intel.com>2015-01-07 18:04:18 +0200
committerJens Axboe <axboe@fb.com>2015-01-13 21:57:56 -0700
commit91117a20245b59f70b563523edbf998a62fc6383 (patch)
tree131ea8189f4d56c4fe2e5eb930eeda53654fe890
parent78e367a3601f35ea811e7f5660b7362afa2401fa (diff)
downloadlinux-91117a20245b59f70b563523edbf998a62fc6383.tar.gz
linux-91117a20245b59f70b563523edbf998a62fc6383.tar.bz2
linux-91117a20245b59f70b563523edbf998a62fc6383.zip
axonram: Fix bug in direct_access
The 'pfn' returned by axonram was completely bogus, and has been since 2008. Signed-off-by: Matthew Wilcox <matthew.r.wilcox@intel.com> Reviewed-by: Jan Kara <jack@suse.cz> Reviewed-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> Cc: stable@vger.kernel.org Signed-off-by: Jens Axboe <axboe@fb.com>
-rw-r--r--arch/powerpc/sysdev/axonram.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/sysdev/axonram.c b/arch/powerpc/sysdev/axonram.c
index f532c92bf99d..367533bb3d48 100644
--- a/arch/powerpc/sysdev/axonram.c
+++ b/arch/powerpc/sysdev/axonram.c
@@ -156,7 +156,7 @@ axon_ram_direct_access(struct block_device *device, sector_t sector,
}
*kaddr = (void *)(bank->ph_addr + offset);
- *pfn = virt_to_phys(kaddr) >> PAGE_SHIFT;
+ *pfn = virt_to_phys(*kaddr) >> PAGE_SHIFT;
return 0;
}