Skip to content

Commit 68c32eb

Browse files
committed
s390: remove xpram device driver
Support for expanded storage was only available until z13 and z/VM 6.3 respectively. However there haven't been any use cases a long time before for this device driver. Therefore remove it. Acked-by: Christian Borntraeger <borntraeger@de.ibm.com> Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
1 parent 85ad272 commit 68c32eb

File tree

5 files changed

+0
-430
lines changed

5 files changed

+0
-430
lines changed

arch/s390/configs/defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,6 @@ CONFIG_BLK_DEV_DRBD=m
397397
CONFIG_BLK_DEV_NBD=m
398398
CONFIG_BLK_DEV_RAM=y
399399
CONFIG_BLK_DEV_RAM_SIZE=32768
400-
# CONFIG_BLK_DEV_XPRAM is not set
401400
CONFIG_VIRTIO_BLK=y
402401
CONFIG_BLK_DEV_RBD=m
403402
CONFIG_BLK_DEV_NVME=m

arch/s390/configs/zfcpdump_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ CONFIG_NET=y
3535
# CONFIG_ETHTOOL_NETLINK is not set
3636
CONFIG_DEVTMPFS=y
3737
CONFIG_BLK_DEV_RAM=y
38-
# CONFIG_BLK_DEV_XPRAM is not set
3938
# CONFIG_DCSSBLK is not set
4039
# CONFIG_DASD is not set
4140
CONFIG_ENCLOSURE_SERVICES=y

drivers/s390/block/Kconfig

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,6 @@
22
comment "S/390 block device drivers"
33
depends on S390 && BLOCK
44

5-
config BLK_DEV_XPRAM
6-
def_tristate m
7-
prompt "XPRAM disk support"
8-
depends on S390 && BLOCK
9-
help
10-
Select this option if you want to use your expanded storage on S/390
11-
or zSeries as a disk. This is useful as a _fast_ swap device if you
12-
want to access more than 2G of memory when running in 31 bit mode.
13-
This option is also available as a module which will be called
14-
xpram. If unsure, say "N".
15-
165
config DCSSBLK
176
def_tristate m
187
select FS_DAX_LIMITED

drivers/s390/block/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ obj-$(CONFIG_DASD) += dasd_mod.o
1616
obj-$(CONFIG_DASD_DIAG) += dasd_diag_mod.o
1717
obj-$(CONFIG_DASD_ECKD) += dasd_eckd_mod.o
1818
obj-$(CONFIG_DASD_FBA) += dasd_fba_mod.o
19-
obj-$(CONFIG_BLK_DEV_XPRAM) += xpram.o
2019
obj-$(CONFIG_DCSSBLK) += dcssblk.o
2120

2221
scm_block-objs := scm_drv.o scm_blk.o

0 commit comments

Comments
 (0)