From: Stephen Rothwell Date: Wed, 3 Oct 2012 03:20:17 +0000 (+1000) Subject: Merge remote-tracking branch 'virtio/virtio-next' X-Git-Tag: next-20121003~45 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6a917e41615de60a939633036129a598c16da62c;p=karo-tx-linux.git Merge remote-tracking branch 'virtio/virtio-next' --- 6a917e41615de60a939633036129a598c16da62c diff --cc arch/s390/Kconfig index 2591b51dc03d,9faf3d9b26c7..de7ce84eae56 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig @@@ -658,13 -587,56 +658,12 @@@ config S390_GUES depends on 64BIT && EXPERIMENTAL select VIRTUALIZATION select VIRTIO - select VIRTIO_RING select VIRTIO_CONSOLE help - Select this option if you want to run the kernel as a guest under - the KVM hypervisor. This will add detection for KVM as well as a - virtio transport. If KVM is detected, the virtio console will be - the default console. - -config SECCOMP - def_bool y - prompt "Enable seccomp to safely compute untrusted bytecode" - depends on PROC_FS - help - This kernel feature is useful for number crunching applications - that may need to compute untrusted bytecode during their - execution. By using pipes or other transports made available to - the process as file descriptors supporting the read/write - syscalls, it's possible to isolate those applications in - their own address space using seccomp. Once seccomp is - enabled via /proc//seccomp, it cannot be disabled - and the task is only allowed to execute a few safe syscalls - defined by each seccomp mode. - - If unsure, say Y. - -endmenu + Enabling this option adds support for virtio based paravirtual device + drivers on s390. -menu "Power Management" - -source "kernel/power/Kconfig" + Select this option if you want to run the kernel as a guest under + the KVM hypervisor. endmenu - -source "net/Kconfig" - -config PCMCIA - def_bool n - -config CCW - def_bool y - -source "drivers/Kconfig" - -source "fs/Kconfig" - -source "arch/s390/Kconfig.debug" - -source "security/Kconfig" - -source "crypto/Kconfig" - -source "lib/Kconfig" - -source "arch/s390/kvm/Kconfig"