summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Weinberger2015-05-04 20:58:57 +0200
committerJens Axboe2015-06-11 23:54:58 +0200
commitb6f2098fb708ce935a59763178c4e8cd942fcf88 (patch)
treee1e469c27674971d8820a656a1b866b0c577e73f
parentblock: fix ext_dev_lock lockdep report (diff)
downloadkernel-qcow2-linux-b6f2098fb708ce935a59763178c4e8cd942fcf88.tar.gz
kernel-qcow2-linux-b6f2098fb708ce935a59763178c4e8cd942fcf88.tar.xz
kernel-qcow2-linux-b6f2098fb708ce935a59763178c4e8cd942fcf88.zip
block: pmem: Add dependency on HAS_IOMEM
Not all architectures have io memory. Fixes: drivers/block/pmem.c: In function ‘pmem_alloc’: drivers/block/pmem.c:146:2: error: implicit declaration of function ‘ioremap_nocache’ [-Werror=implicit-function-declaration] pmem->virt_addr = ioremap_nocache(pmem->phys_addr, pmem->size); ^ drivers/block/pmem.c:146:18: warning: assignment makes pointer from integer without a cast [enabled by default] pmem->virt_addr = ioremap_nocache(pmem->phys_addr, pmem->size); ^ drivers/block/pmem.c:182:2: error: implicit declaration of function ‘iounmap’ [-Werror=implicit-function-declaration] iounmap(pmem->virt_addr); ^ Signed-off-by: Richard Weinberger <richard@nod.at> Reviewed-by: Ross Zwisler <ross.zwisler@linux.intel.com> Signed-off-by: Jens Axboe <axboe@fb.com>
-rw-r--r--drivers/block/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index eb1fed5bd516..3ccef9eba6f9 100644
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -406,6 +406,7 @@ config BLK_DEV_RAM_DAX
config BLK_DEV_PMEM
tristate "Persistent memory block device support"
+ depends on HAS_IOMEM
help
Saying Y here will allow you to use a contiguous range of reserved
memory as one or more persistent block devices.