diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2015-08-27 19:40:26 -0400 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2015-08-27 19:40:26 -0400 |
| commit | 4a9bf88a5caa8495b5eb2b738d5fb40924bbc538 (patch) | |
| tree | 7c2901cb67a7dd7c863fee6924afe24be79cddab /arch/powerpc/sysdev/axonram.c | |
| parent | a06a7576526e10a99ea7721533e7f2df3e26baad (diff) | |
| parent | 67a3e8fe90156d41cd480d3dfbb40f3bc007c262 (diff) | |
Merge branch 'pmem-api' into libnvdimm-for-next
Diffstat (limited to 'arch/powerpc/sysdev/axonram.c')
| -rw-r--r-- | arch/powerpc/sysdev/axonram.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/powerpc/sysdev/axonram.c b/arch/powerpc/sysdev/axonram.c index ee90db17b097..a2be2a66dab6 100644 --- a/arch/powerpc/sysdev/axonram.c +++ b/arch/powerpc/sysdev/axonram.c @@ -141,13 +141,14 @@ axon_ram_make_request(struct request_queue *queue, struct bio *bio) */ static long axon_ram_direct_access(struct block_device *device, sector_t sector, - void **kaddr, unsigned long *pfn, long size) + void __pmem **kaddr, unsigned long *pfn, long size) { struct axon_ram_bank *bank = device->bd_disk->private_data; loff_t offset = (loff_t)sector << AXON_RAM_SECTOR_SHIFT; + void *addr = (void *)(bank->ph_addr + offset); - *kaddr = (void *)(bank->ph_addr + offset); - *pfn = virt_to_phys(*kaddr) >> PAGE_SHIFT; + *kaddr = (void __pmem *)addr; + *pfn = virt_to_phys(addr) >> PAGE_SHIFT; return bank->size - offset; } |