diff options
| author | Matthew Wilcox <matthew.r.wilcox@intel.com> | 2015-01-07 18:04:18 +0200 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2015-05-09 23:16:12 +0100 |
| commit | d9a675287ed448bc385fd789172594e4d3f8d870 (patch) | |
| tree | 403ae112dd68814c471049430b4168addea200db /arch | |
| parent | 7bfb4dbe4873111807be7d57b65a298016ee0b57 (diff) | |
| download | linux-stable-d9a675287ed448bc385fd789172594e4d3f8d870.tar.gz linux-stable-d9a675287ed448bc385fd789172594e4d3f8d870.tar.bz2 linux-stable-d9a675287ed448bc385fd789172594e4d3f8d870.zip | |
axonram: Fix bug in direct_access
commit 91117a20245b59f70b563523edbf998a62fc6383 upstream.
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>
Signed-off-by: Jens Axboe <axboe@fb.com>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/sysdev/axonram.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/sysdev/axonram.c b/arch/powerpc/sysdev/axonram.c index ba4271919062..9befade9c71e 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; } |