]> git.hungrycats.org Git - linux/commitdiff
axonram: Fix bug in direct_access
authorMatthew Wilcox <matthew.r.wilcox@intel.com>
Wed, 7 Jan 2015 16:04:18 +0000 (18:04 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 6 Mar 2015 22:43:30 +0000 (14:43 -0800)
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/powerpc/sysdev/axonram.c

index 47b6b9f81d4305537b7d0e6290e178efb4253f4c..830edc83c12ac1dd406236db0626be1f56c14ea6 100644 (file)
@@ -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;
 }