diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-05-06 23:39:50 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-05-06 23:39:50 +0200 |
| commit | e48661230cc35b3d0f4367eddfc19f86463ab917 (patch) | |
| tree | 34ea72ba955366988f3fe7c8761d7d7d84076ce9 /arch/s390/configs/debug_defconfig | |
| parent | Merge tag 'vfio-v5.13-rc1pt2' of git://github.com/awilliam/linux-vfio (diff) | |
| parent | s390: fix detection of vector enhancements facility 1 vs. vector packed decim... (diff) | |
| download | linux-e48661230cc35b3d0f4367eddfc19f86463ab917.tar.xz linux-e48661230cc35b3d0f4367eddfc19f86463ab917.zip | |
Merge tag 's390-5.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull more s390 updates from Heiko Carstens:
- add support for system call stack randomization
- handle stale PCI deconfiguration events
- couple of defconfig updates
- some fixes and cleanups
* tag 's390-5.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
s390: fix detection of vector enhancements facility 1 vs. vector packed decimal facility
s390/entry: add support for syscall stack randomization
s390/configs: change CONFIG_VIRTIO_CONSOLE to "m"
s390/cio: remove invalid condition on IO_SCH_UNREG
s390/cpumf: remove call to perf_event_update_userpage
s390/cpumf: move counter set size calculation to common place
s390/cpumf: beautify if-then-else indentation
s390/configs: enable CONFIG_PCI_IOV
s390/pci: handle stale deconfiguration events
s390/pci: rename zpci_configure_device()
Diffstat (limited to 'arch/s390/configs/debug_defconfig')
| -rw-r--r-- | arch/s390/configs/debug_defconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/s390/configs/debug_defconfig b/arch/s390/configs/debug_defconfig index 6422618a4f75..86afcc6b56bf 100644 --- a/arch/s390/configs/debug_defconfig +++ b/arch/s390/configs/debug_defconfig @@ -387,6 +387,7 @@ CONFIG_CGROUP_NET_PRIO=y CONFIG_BPF_JIT=y CONFIG_NET_PKTGEN=m CONFIG_PCI=y +CONFIG_PCI_IOV=y # CONFIG_PCIEASPM is not set CONFIG_PCI_DEBUG=y CONFIG_HOTPLUG_PCI=y @@ -548,7 +549,7 @@ CONFIG_INPUT_EVDEV=y # CONFIG_INPUT_MOUSE is not set # CONFIG_SERIO is not set CONFIG_LEGACY_PTY_COUNT=0 -CONFIG_VIRTIO_CONSOLE=y +CONFIG_VIRTIO_CONSOLE=m CONFIG_HW_RANDOM_VIRTIO=m CONFIG_RAW_DRIVER=m CONFIG_HANGCHECK_TIMER=m |