| Message ID | 20211018044054.1779424-3-hch@lst.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [01/11] dm: make the DAX support dependend on CONFIG_FS_DAX | expand |
On Sun, Oct 17, 2021 at 9:41 PM Christoph Hellwig <hch@lst.de> wrote: > > CONFIG_DAX_DRIVER only selects CONFIG_DAX now, so remove it. Looks good, I don't think an s390 ack is needed for this one. > Signed-off-by: Christoph Hellwig <hch@lst.de> > --- > drivers/dax/Kconfig | 4 ---- > drivers/nvdimm/Kconfig | 2 +- > drivers/s390/block/Kconfig | 2 +- > fs/fuse/Kconfig | 2 +- > 4 files changed, 3 insertions(+), 7 deletions(-) > > diff --git a/drivers/dax/Kconfig b/drivers/dax/Kconfig > index d2834c2cfa10d..954ab14ba7778 100644 > --- a/drivers/dax/Kconfig > +++ b/drivers/dax/Kconfig > @@ -1,8 +1,4 @@ > # SPDX-License-Identifier: GPL-2.0-only > -config DAX_DRIVER > - select DAX > - bool > - > menuconfig DAX > tristate "DAX: direct access to differentiated memory" > select SRCU > diff --git a/drivers/nvdimm/Kconfig b/drivers/nvdimm/Kconfig > index b7d1eb38b27d4..347fe7afa5830 100644 > --- a/drivers/nvdimm/Kconfig > +++ b/drivers/nvdimm/Kconfig > @@ -22,7 +22,7 @@ if LIBNVDIMM > config BLK_DEV_PMEM > tristate "PMEM: Persistent memory block device support" > default LIBNVDIMM > - select DAX_DRIVER > + select DAX > select ND_BTT if BTT > select ND_PFN if NVDIMM_PFN > help > diff --git a/drivers/s390/block/Kconfig b/drivers/s390/block/Kconfig > index d0416dbd0cd81..e3710a762abae 100644 > --- a/drivers/s390/block/Kconfig > +++ b/drivers/s390/block/Kconfig > @@ -5,7 +5,7 @@ comment "S/390 block device drivers" > config DCSSBLK > def_tristate m > select FS_DAX_LIMITED > - select DAX_DRIVER > + select DAX > prompt "DCSSBLK support" > depends on S390 && BLOCK > help > diff --git a/fs/fuse/Kconfig b/fs/fuse/Kconfig > index 40ce9a1c12e5d..038ed0b9aaa5d 100644 > --- a/fs/fuse/Kconfig > +++ b/fs/fuse/Kconfig > @@ -45,7 +45,7 @@ config FUSE_DAX > select INTERVAL_TREE > depends on VIRTIO_FS > depends on FS_DAX > - depends on DAX_DRIVER > + depends on DAX > help > This allows bypassing guest page cache and allows mapping host page > cache directly in guest address space. > -- > 2.30.2 >
diff --git a/drivers/dax/Kconfig b/drivers/dax/Kconfig index d2834c2cfa10d..954ab14ba7778 100644 --- a/drivers/dax/Kconfig +++ b/drivers/dax/Kconfig @@ -1,8 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-only -config DAX_DRIVER - select DAX - bool - menuconfig DAX tristate "DAX: direct access to differentiated memory" select SRCU diff --git a/drivers/nvdimm/Kconfig b/drivers/nvdimm/Kconfig index b7d1eb38b27d4..347fe7afa5830 100644 --- a/drivers/nvdimm/Kconfig +++ b/drivers/nvdimm/Kconfig @@ -22,7 +22,7 @@ if LIBNVDIMM config BLK_DEV_PMEM tristate "PMEM: Persistent memory block device support" default LIBNVDIMM - select DAX_DRIVER + select DAX select ND_BTT if BTT select ND_PFN if NVDIMM_PFN help diff --git a/drivers/s390/block/Kconfig b/drivers/s390/block/Kconfig index d0416dbd0cd81..e3710a762abae 100644 --- a/drivers/s390/block/Kconfig +++ b/drivers/s390/block/Kconfig @@ -5,7 +5,7 @@ comment "S/390 block device drivers" config DCSSBLK def_tristate m select FS_DAX_LIMITED - select DAX_DRIVER + select DAX prompt "DCSSBLK support" depends on S390 && BLOCK help diff --git a/fs/fuse/Kconfig b/fs/fuse/Kconfig index 40ce9a1c12e5d..038ed0b9aaa5d 100644 --- a/fs/fuse/Kconfig +++ b/fs/fuse/Kconfig @@ -45,7 +45,7 @@ config FUSE_DAX select INTERVAL_TREE depends on VIRTIO_FS depends on FS_DAX - depends on DAX_DRIVER + depends on DAX help This allows bypassing guest page cache and allows mapping host page cache directly in guest address space.
CONFIG_DAX_DRIVER only selects CONFIG_DAX now, so remove it. Signed-off-by: Christoph Hellwig <hch@lst.de> --- drivers/dax/Kconfig | 4 ---- drivers/nvdimm/Kconfig | 2 +- drivers/s390/block/Kconfig | 2 +- fs/fuse/Kconfig | 2 +- 4 files changed, 3 insertions(+), 7 deletions(-)