axonram: Fix bug in direct_access
authorMatthew Wilcox <matthew.r.wilcox@intel.com>
Wed, 7 Jan 2015 16:04:18 +0000 (18:04 +0200)
committerJens Axboe <axboe@fb.com>
Wed, 14 Jan 2015 04:57:56 +0000 (21:57 -0700)
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>
arch/powerpc/sysdev/axonram.c

index f532c92..367533b 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;
 }