summaryrefslogtreecommitdiffstats
path: root/config-x86_64-generic
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2015-06-30 13:01:28 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2015-06-30 13:01:28 -0400
commit6a50f368784f29b0772f265a05b9e395bb2c23ff (patch)
tree80faccf654cbbaae2a0a74686db514f663623bb2 /config-x86_64-generic
parent498236e304bc3f3c936ef937b2a101b9e22f6544 (diff)
downloadkernel-6a50f368784f29b0772f265a05b9e395bb2c23ff.tar.gz
kernel-6a50f368784f29b0772f265a05b9e395bb2c23ff.tar.xz
kernel-6a50f368784f29b0772f265a05b9e395bb2c23ff.zip
Linux v4.1-11355-g6aaf0da8728c
- Add patch to fix KVM sleeping in atomic issue (rhbz 1237143) - Fix errant with_perf disable that removed perf entirely (rhbz 1237266)
Diffstat (limited to 'config-x86_64-generic')
-rw-r--r--config-x86_64-generic7
1 files changed, 7 insertions, 0 deletions
diff --git a/config-x86_64-generic b/config-x86_64-generic
index bb3253fbb..140948430 100644
--- a/config-x86_64-generic
+++ b/config-x86_64-generic
@@ -11,6 +11,8 @@ CONFIG_UV_MMTIMER=m
CONFIG_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
@@ -186,6 +188,11 @@ 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