diff options
author | Laura Abbott <labbott@fedoraproject.org> | 2015-09-01 15:03:08 -0700 |
---|---|---|
committer | Laura Abbott <labbott@fedoraproject.org> | 2015-09-01 15:59:56 -0700 |
commit | d07b889185195409a6090ed3e12fff475b4258f4 (patch) | |
tree | c2b98784a9c45c2ba5420c4a256c03d1c1c2e125 /config-x86_64-generic | |
parent | 07775e21b6d0c7b9c2251deb8cb5ef3052a38c6e (diff) | |
download | kernel-d07b889185195409a6090ed3e12fff475b4258f4.tar.gz kernel-d07b889185195409a6090ed3e12fff475b4258f4.tar.xz kernel-d07b889185195409a6090ed3e12fff475b4258f4.zip |
Linux v4.2
This is a squashed patch of the history from F22 + the 4.2 rebase
Diffstat (limited to 'config-x86_64-generic')
-rw-r--r-- | config-x86_64-generic | 47 |
1 files changed, 39 insertions, 8 deletions
diff --git a/config-x86_64-generic b/config-x86_64-generic index 02883b84b..0fc3068dd 100644 --- a/config-x86_64-generic +++ b/config-x86_64-generic @@ -9,9 +9,10 @@ CONFIG_GENERIC_CPU=y CONFIG_X86_UV=y CONFIG_UV_MMTIMER=m CONFIG_NUMA=y -CONFIG_K8_NUMA=y CONFIG_AMD_NUMA=y CONFIG_X86_64_ACPI_NUMA=y +CONFIG_ACPI_NFIT=m +# CONFIG_ACPI_NFIT_DEBUG is not set # CONFIG_NUMA_EMU is not set # CONFIG_X86_NUMACHIP is not set CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y @@ -25,6 +26,9 @@ CONFIG_PHYSICAL_ALIGN=0x1000000 # https://lists.fedoraproject.org/pipermail/kernel/2013-December/004753.html CONFIG_DEFAULT_MMAP_MIN_ADDR=65536 +# enable the 32-bit entry point for Baytrail +CONFIG_EFI_MIXED=y + CONFIG_IA32_EMULATION=y # CONFIG_IA32_AOUT is not set @@ -42,17 +46,26 @@ CONFIG_CGROUP_HUGETLB=y CONFIG_MEM_SOFT_DIRTY=y CONFIG_KEXEC_JUMP=y +CONFIG_KEXEC_FILE=y +CONFIG_KEXEC_VERIFY_SIG=y +CONFIG_KEXEC_BZIMAGE_VERIFY_SIG=y CONFIG_ACPI_HOTPLUG_MEMORY=y # CONFIG_INTEL_SCU_IPC is not set +CONFIG_SCIF_BUS=m +CONFIG_SCIF=m + CONFIG_INTEL_MIC_HOST=m CONFIG_INTEL_MIC_CARD=m +CONFIG_INTEL_MIC_BUS=m +CONFIG_INTEL_MIC_X100_DMA=m # SHPC has half-arsed PCI probing, which makes it load on too many systems CONFIG_HOTPLUG_PCI_SHPC=m +# CONFIG_CRYPTO_SHA1_MB is not set CONFIG_CRYPTO_AES_X86_64=y CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m CONFIG_CRYPTO_TWOFISH_X86_64=m @@ -62,7 +75,6 @@ CONFIG_CRYPTO_SHA1_SSSE3=m CONFIG_CRYPTO_SHA256_SSSE3=m CONFIG_CRYPTO_SHA512_SSSE3=m CONFIG_CRYPTO_BLOWFISH_X86_64=m -CONFIG_CRYPTO_BLOWFISH_AVX2_X86_64=m CONFIG_CRYPTO_TWOFISH_X86_64_3WAY=m CONFIG_CRYPTO_CAMELLIA_X86_64=m CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64=m @@ -73,7 +85,9 @@ CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m CONFIG_CRYPTO_SERPENT_AVX_X86_64=m CONFIG_CRYPTO_SERPENT_AVX2_X86_64=m CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m -CONFIG_CRYPTO_TWOFISH_AVX2_X86_64=m +CONFIG_CRYPTO_DES3_EDE_X86_64=m +# staging crypto +# CONFIG_CRYPTO_SKEIN is not set # CONFIG_I2C_ALI1535 is not set # CONFIG_I2C_ALI1563 is not set @@ -97,6 +111,7 @@ CONFIG_SPARSEMEM_VMEMMAP=y CONFIG_MEMORY_HOTPLUG=y # CONFIG_ARCH_MEMORY_PROBE is not set # CONFIG_MEMORY_HOTREMOVE is not set +# CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set # CONFIG_BLK_DEV_CMD640 is not set # CONFIG_BLK_DEV_RZ1000 is not set @@ -141,35 +156,51 @@ CONFIG_RCU_FANOUT=64 CONFIG_INTEL_TXT=y -CONFIG_GPIO_LANGWELL=y +# CONFIG_OF is not set CONFIG_FUNCTION_GRAPH_TRACER=y CONFIG_I7300_IDLE=m -CONFIG_BPF_JIT=y - # https://fedoraproject.org/wiki/Features/Checkpoint_Restore CONFIG_CHECKPOINT_RESTORE=y # Should be 32bit only, but lacks KConfig depends # CONFIG_XO15_EBOOK is not set +CONFIG_THUNDERBOLT=m + CONFIG_NTB=m CONFIG_NTB_NETDEV=m +CONFIG_NTB_INTEL=m +CONFIG_NTB_PINGPONG=m +CONFIG_NTB_TOOL=m +CONFIG_NTB_TRANSPORT=m # 10GigE # CONFIG_IP1000=m CONFIG_MLX4_EN=m CONFIG_MLX4_EN_DCB=y +CONFIG_MLX4_EN_VXLAN=y # CONFIG_MLX4_DEBUG is not set CONFIG_SFC=m CONFIG_SFC_MCDI_MON=y CONFIG_SFC_SRIOV=y -CONFIG_SFC_PTP=y CONFIG_SFC_MTD=y +# CONFIG_SFC_MCDI_LOGGING is not set # Override MTD stuff because SFC_MTD needs it -CONFIG_MTD_CHAR=m CONFIG_MTD_BLOCK=m +CONFIG_HSA_AMD=m + +CONFIG_LIBNVDIMM=m +CONFIG_BTT=y +CONFIG_ND_BTT=m +CONFIG_ND_BLK=m + +CONFIG_NO_HZ_FULL=y +# CONFIG_NO_HZ_IDLE is not set +# CONFIG_NO_HZ_FULL_ALL is not set +# CONFIG_NO_HZ_FULL_SYSIDLE is not set +# CONFIG_CONTEXT_TRACKING_FORCE is not set |