Merge pull request #686 from nitkon/vsock

kernel: enable vsock on ppc64le
This commit is contained in:
Salvador Fuentes
2019-08-26 10:47:33 -05:00
committed by GitHub
2 changed files with 13 additions and 7 deletions

View File

@@ -1,14 +1,15 @@
# #
# Automatically generated file; DO NOT EDIT. # Automatically generated file; DO NOT EDIT.
# Linux/powerpc 4.19.10 Kernel Configuration # Linux/powerpc 4.19.67 Kernel Configuration
# #
# #
# Compiler: gcc (Ubuntu 7.4.0-1ubuntu1~18.04) 7.4.0 # Compiler: gcc (Ubuntu 7.4.0-1ubuntu1~18.04.1) 7.4.0
# #
CONFIG_CC_IS_GCC=y CONFIG_CC_IS_GCC=y
CONFIG_GCC_VERSION=70400 CONFIG_GCC_VERSION=70400
CONFIG_CLANG_VERSION=0 CONFIG_CLANG_VERSION=0
CONFIG_CC_HAS_ASM_GOTO=y
CONFIG_IRQ_WORK=y CONFIG_IRQ_WORK=y
CONFIG_BUILDTIME_EXTABLE_SORT=y CONFIG_BUILDTIME_EXTABLE_SORT=y
@@ -483,6 +484,7 @@ CONFIG_ARCH_RANDOM=y
CONFIG_VIRTUALIZATION=y CONFIG_VIRTUALIZATION=y
# CONFIG_KVM_BOOK3S_64 is not set # CONFIG_KVM_BOOK3S_64 is not set
# CONFIG_VHOST_NET is not set # CONFIG_VHOST_NET is not set
# CONFIG_VHOST_VSOCK is not set
# CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set # CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set
CONFIG_HAVE_LIVEPATCH=y CONFIG_HAVE_LIVEPATCH=y
@@ -646,7 +648,7 @@ CONFIG_COMPAT_BINFMT_ELF=y
CONFIG_ELFCORE=y CONFIG_ELFCORE=y
CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
CONFIG_BINFMT_SCRIPT=y CONFIG_BINFMT_SCRIPT=y
# CONFIG_BINFMT_MISC is not set CONFIG_BINFMT_MISC=y
CONFIG_COREDUMP=y CONFIG_COREDUMP=y
# #
@@ -885,7 +887,10 @@ CONFIG_NET_SCH_FIFO=y
CONFIG_DNS_RESOLVER=y CONFIG_DNS_RESOLVER=y
# CONFIG_BATMAN_ADV is not set # CONFIG_BATMAN_ADV is not set
# CONFIG_OPENVSWITCH is not set # CONFIG_OPENVSWITCH is not set
# CONFIG_VSOCKETS is not set CONFIG_VSOCKETS=y
CONFIG_VSOCKETS_DIAG=y
CONFIG_VIRTIO_VSOCKETS=y
CONFIG_VIRTIO_VSOCKETS_COMMON=y
# CONFIG_NETLINK_DIAG is not set # CONFIG_NETLINK_DIAG is not set
# CONFIG_MPLS is not set # CONFIG_MPLS is not set
# CONFIG_NET_NSH is not set # CONFIG_NET_NSH is not set
@@ -1350,6 +1355,7 @@ CONFIG_NET_CORE=y
# CONFIG_MACVLAN is not set # CONFIG_MACVLAN is not set
# CONFIG_IPVLAN is not set # CONFIG_IPVLAN is not set
# CONFIG_VXLAN is not set # CONFIG_VXLAN is not set
# CONFIG_GTP is not set
# CONFIG_MACSEC is not set # CONFIG_MACSEC is not set
CONFIG_NETCONSOLE=y CONFIG_NETCONSOLE=y
CONFIG_NETPOLL=y CONFIG_NETPOLL=y
@@ -1578,7 +1584,7 @@ CONFIG_SWPHY=y
# #
# CONFIG_AMD_PHY is not set # CONFIG_AMD_PHY is not set
# CONFIG_AQUANTIA_PHY is not set # CONFIG_AQUANTIA_PHY is not set
# CONFIG_ASIX_PHY is not set # CONFIG_AX88796B_PHY is not set
# CONFIG_AT803X_PHY is not set # CONFIG_AT803X_PHY is not set
# CONFIG_BCM7XXX_PHY is not set # CONFIG_BCM7XXX_PHY is not set
# CONFIG_BCM87XX_PHY is not set # CONFIG_BCM87XX_PHY is not set
@@ -1766,6 +1772,7 @@ CONFIG_LEGACY_PTY_COUNT=256
# CONFIG_N_GSM is not set # CONFIG_N_GSM is not set
# CONFIG_TRACE_SINK is not set # CONFIG_TRACE_SINK is not set
# CONFIG_PPC_EPAPR_HV_BYTECHAN is not set # CONFIG_PPC_EPAPR_HV_BYTECHAN is not set
CONFIG_LDISC_AUTOLOAD=y
CONFIG_DEVMEM=y CONFIG_DEVMEM=y
# CONFIG_DEVKMEM is not set # CONFIG_DEVKMEM is not set
@@ -1825,7 +1832,6 @@ CONFIG_HW_RANDOM_TIMERIOMEM=y
CONFIG_HW_RANDOM_VIRTIO=y CONFIG_HW_RANDOM_VIRTIO=y
CONFIG_HW_RANDOM_PSERIES=y CONFIG_HW_RANDOM_PSERIES=y
CONFIG_HW_RANDOM_POWERNV=y CONFIG_HW_RANDOM_POWERNV=y
# CONFIG_R3964 is not set
# CONFIG_APPLICOM is not set # CONFIG_APPLICOM is not set
# #

View File

@@ -1 +1 @@
47 48