diff options
| author | Peter Robinson <pbrobinson@gmail.com> | 2015-05-03 18:50:11 +0100 |
|---|---|---|
| committer | Peter Robinson <pbrobinson@gmail.com> | 2015-05-03 18:50:11 +0100 |
| commit | 2e3090902b7028c79a57bed28cbecb2baeaf7a0a (patch) | |
| tree | 1f5446cca2bc74d749a731d72703766bc1f7924f | |
| parent | d47bfb2bcb4b4690be7d771570ea4842d73b7fb8 (diff) | |
| download | kernel-2e3090902b7028c79a57bed28cbecb2baeaf7a0a.tar.gz kernel-2e3090902b7028c79a57bed28cbecb2baeaf7a0a.tar.xz kernel-2e3090902b7028c79a57bed28cbecb2baeaf7a0a.zip | |
minor virt config cleanups (NFC)
| -rw-r--r-- | config-arm64 | 2 | ||||
| -rw-r--r-- | config-armv7-lpae | 1 | ||||
| -rw-r--r-- | config-generic | 1 | ||||
| -rw-r--r-- | config-powerpc64 | 2 | ||||
| -rw-r--r-- | config-powerpc64p7 | 2 | ||||
| -rw-r--r-- | config-s390x | 3 | ||||
| -rw-r--r-- | config-x86-generic | 1 |
7 files changed, 1 insertions, 11 deletions
diff --git a/config-arm64 b/config-arm64 index ae9ba100a..af8db0ae7 100644 --- a/config-arm64 +++ b/config-arm64 @@ -74,8 +74,6 @@ CONFIG_SPARSEMEM_VMEMMAP=y # CONFIG_SYS_HYPERVISOR is not set # CONFIG_THERMAL is not set -CONFIG_VIRTUALIZATION=y -CONFIG_VM_EVENT_COUNTERS=y CONFIG_EFI=y CONFIG_EFI_VARS=y diff --git a/config-armv7-lpae b/config-armv7-lpae index 154781632..5166b6cd4 100644 --- a/config-armv7-lpae +++ b/config-armv7-lpae @@ -15,7 +15,6 @@ CONFIG_ARM_LPAE=y CONFIG_SYS_SUPPORTS_HUGETLBFS=y CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y CONFIG_ARM_VIRT_EXT=y -CONFIG_VIRTUALIZATION=y CONFIG_ARM_DMA_IOMMU_ALIGNMENT=8 CONFIG_CMA_SIZE_SEL_MBYTES=y diff --git a/config-generic b/config-generic index 508eeee4d..a45336704 100644 --- a/config-generic +++ b/config-generic @@ -386,6 +386,7 @@ CONFIG_BLK_DEV_THROTTLING=y # CONFIG_BLK_DEV_HD is not set # CONFIG_BLK_DEV_RSXX is not set +CONFIG_VIRTUALIZATION=y CONFIG_SCSI_VIRTIO=m CONFIG_VIRTIO_BLK=m CONFIG_VIRTIO_PCI=m diff --git a/config-powerpc64 b/config-powerpc64 index 0b1045e9e..6b4bbae59 100644 --- a/config-powerpc64 +++ b/config-powerpc64 @@ -68,7 +68,6 @@ CONFIG_PATA_SCC=m CONFIG_APM_EMULATION=m CONFIG_PPC64=y -CONFIG_VIRT_CPU_ACCOUNTING=y CONFIG_NR_CPUS=1024 # CONFIG_FB_PLATINUM is not set # CONFIG_FB_VALKYRIE is not set @@ -117,7 +116,6 @@ CONFIG_EDAC_CPC925=m CONFIG_FRAME_WARN=2048 CONFIG_FORCE_MAX_ZONEORDER=9 -CONFIG_VIRTUALIZATION=y CONFIG_VSX=y diff --git a/config-powerpc64p7 b/config-powerpc64p7 index 48d607db1..76dcf5d3c 100644 --- a/config-powerpc64p7 +++ b/config-powerpc64p7 @@ -58,7 +58,6 @@ CONFIG_PATA_SCC=m CONFIG_APM_EMULATION=m CONFIG_PPC64=y -CONFIG_VIRT_CPU_ACCOUNTING=y CONFIG_NR_CPUS=1024 # CONFIG_FB_PLATINUM is not set # CONFIG_FB_VALKYRIE is not set @@ -107,7 +106,6 @@ CONFIG_EDAC_CPC925=m CONFIG_FRAME_WARN=2048 CONFIG_FORCE_MAX_ZONEORDER=9 -CONFIG_VIRTUALIZATION=y CONFIG_VSX=y diff --git a/config-s390x b/config-s390x index 7d1ba22ce..ec433936d 100644 --- a/config-s390x +++ b/config-s390x @@ -146,8 +146,6 @@ CONFIG_DIAG288_WATCHDOG=m CONFIG_VMLOGRDR=m CONFIG_MONREADER=m -CONFIG_VIRT_CPU_ACCOUNTING=y - # CONFIG_CDROM_PKTCDVD is not set # CONFIG_ATA_OVER_ETH is not set # CONFIG_MII is not set @@ -173,7 +171,6 @@ CONFIG_CTCM=m CONFIG_QETH_L2=m CONFIG_QETH_L3=m CONFIG_CRYPTO_SHA512_S390=m -CONFIG_VIRTUALIZATION=y CONFIG_KVM=m # CONFIG_KVM_S390_UCONTROL is not set CONFIG_S390_GUEST=y diff --git a/config-x86-generic b/config-x86-generic index c024328ad..0a100a837 100644 --- a/config-x86-generic +++ b/config-x86-generic @@ -257,7 +257,6 @@ CONFIG_CRASH_DUMP=y CONFIG_PROC_VMCORE=y CONFIG_CRASH=m -CONFIG_VIRTUALIZATION=y CONFIG_KVM=m CONFIG_KVM_INTEL=m CONFIG_KVM_AMD=m |