about summary refs log tree commit diff
path: root/machines/aszlig/mmrnmhrm-kconf.nix
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2015-10-07 12:32:25 +0200
committeraszlig <aszlig@redmoonstudios.org>2015-10-07 12:32:25 +0200
commit6a9e18e89dd5b327f993aeea7a620fed12ff29cc (patch)
tree19e01527e61fdb6f7556da03897ff09cd4e17776 /machines/aszlig/mmrnmhrm-kconf.nix
parent09d37eb845075ad7c090c5129281ec4ead075e70 (diff)
mmrnmhrm/dnyarri: Update kernel src/cfg to 4.3rc4.
It's actually v4.3-rc4 plus 34 commits ahead.

Also I'm being a bit lazy if it comes to the configuration here, adding
modules I probably won't need. That's because I currently don't have the
time to read more into the details.

Anyway, in the future I'd like to unify kernel configuration anyway, so
the laziness hopefully won't stay around for very long. :-)

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'machines/aszlig/mmrnmhrm-kconf.nix')
-rw-r--r--machines/aszlig/mmrnmhrm-kconf.nix32
1 files changed, 25 insertions, 7 deletions
diff --git a/machines/aszlig/mmrnmhrm-kconf.nix b/machines/aszlig/mmrnmhrm-kconf.nix
index 92b990d9..07a5835e 100644
--- a/machines/aszlig/mmrnmhrm-kconf.nix
+++ b/machines/aszlig/mmrnmhrm-kconf.nix
@@ -97,9 +97,11 @@
   "CONFIG_LOG_CPU_MAX_BUF_SHIFT" = "14";
   "CONFIG_HAVE_UNSTABLE_SCHED_CLOCK" = "y";
   "CONFIG_ARCH_SUPPORTS_NUMA_BALANCING" = "y";
+  "CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH" = "y";
   "CONFIG_ARCH_SUPPORTS_INT128" = "y";
   "CONFIG_CGROUPS" = "y";
   "CONFIG_CGROUP_FREEZER" = "y";
+  "CONFIG_CGROUP_PIDS" = "y";
   "CONFIG_CGROUP_DEVICE" = "y";
   "CONFIG_CPUSETS" = "y";
   "CONFIG_CGROUP_CPUACCT" = "y";
@@ -148,12 +150,13 @@
   "CONFIG_AIO" = "y";
   "CONFIG_ADVISE_SYSCALLS" = "y";
   "CONFIG_PCI_QUIRKS" = "y";
+  "CONFIG_MEMBARRIER" = "y";
   "CONFIG_HAVE_PERF_EVENTS" = "y";
   "CONFIG_PERF_EVENTS" = "y";
   "CONFIG_VM_EVENT_COUNTERS" = "y";
   "CONFIG_SLUB_DEBUG" = "y";
   "CONFIG_SLUB" = "y";
-  "CONFIG_SYSTEM_TRUSTED_KEYRING" = "y";
+  "CONFIG_KEXEC_CORE" = "y";
   "CONFIG_HAVE_OPROFILE" = "y";
   "CONFIG_OPROFILE_NMI_TIMER" = "y";
   "CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS" = "y";
@@ -333,6 +336,7 @@
   "CONFIG_ZSMALLOC" = "y";
   "CONFIG_GENERIC_EARLY_IOREMAP" = "y";
   "CONFIG_ARCH_SUPPORTS_DEFERRED_STRUCT_PAGE_INIT" = "y";
+  "CONFIG_FRAME_VECTOR" = "y";
   "CONFIG_X86_RESERVE_LOW" = "64";
   "CONFIG_MTRR" = "y";
   "CONFIG_MTRR_SANITIZER" = "y";
@@ -350,6 +354,7 @@
   "CONFIG_KEXEC_FILE" = "y";
   "CONFIG_PHYSICAL_START" = "0x1000000";
   "CONFIG_PHYSICAL_ALIGN" = "0x1000000";
+  "CONFIG_MODIFY_LDT_SYSCALL" = "y";
   "CONFIG_HAVE_LIVEPATCH" = "y";
   "CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG" = "y";
   "CONFIG_PM" = "y";
@@ -361,6 +366,8 @@
   "CONFIG_ACPI_VIDEO" = "y";
   "CONFIG_ACPI_FAN" = "y";
   "CONFIG_ACPI_DOCK" = "y";
+  "CONFIG_ACPI_CPU_FREQ_PSS" = "y";
+  "CONFIG_ACPI_PROCESSOR_IDLE" = "y";
   "CONFIG_ACPI_PROCESSOR" = "y";
   "CONFIG_ACPI_THERMAL" = "y";
   "CONFIG_ACPI_CUSTOM_DSDT_FILE" = "";
@@ -420,7 +427,6 @@
   "CONFIG_NET_IP_TUNNEL" = "m";
   "CONFIG_NET_UDP_TUNNEL" = "m";
   "CONFIG_NET_FOU" = "m";
-  "CONFIG_GENEVE_CORE" = "m";
   "CONFIG_INET_TUNNEL" = "m";
   "CONFIG_INET_LRO" = "y";
   "CONFIG_INET_DIAG" = "y";
@@ -430,6 +436,7 @@
   "CONFIG_DEFAULT_TCP_CONG" = "cubic";
   "CONFIG_IPV6" = "y";
   "CONFIG_IPV6_ROUTER_PREF" = "y";
+  "CONFIG_IPV6_ILA" = "m";
   "CONFIG_INET6_TUNNEL" = "m";
   "CONFIG_IPV6_SIT" = "m";
   "CONFIG_IPV6_NDISC_NODETYPE" = "y";
@@ -508,6 +515,7 @@
   "CONFIG_BQL" = "y";
   "CONFIG_BPF_JIT" = "y";
   "CONFIG_NET_FLOW_LIMIT" = "y";
+  "CONFIG_LWTUNNEL" = "y";
   "CONFIG_HAVE_BPF_JIT" = "y";
   "CONFIG_DEVTMPFS" = "y";
   "CONFIG_DEVTMPFS_MOUNT" = "y";
@@ -632,6 +640,7 @@
   "CONFIG_THERMAL_GOV_POWER_ALLOCATOR" = "y";
   "CONFIG_INTEL_POWERCLAMP" = "m";
   "CONFIG_X86_PKG_TEMP_THERMAL" = "m";
+  "CONFIG_INTEL_PCH_THERMAL" = "m";
   "CONFIG_SSB_POSSIBLE" = "y";
   "CONFIG_BCMA_POSSIBLE" = "y";
   "CONFIG_MFD_CORE" = "y";
@@ -661,14 +670,16 @@
   "CONFIG_DRM_NOUVEAU_BACKLIGHT" = "y";
   "CONFIG_DRM_BOCHS" = "m";
   "CONFIG_DRM_VIRTIO_GPU" = "m";
+  "CONFIG_DRM_BRIDGE" = "y";
   "CONFIG_FB" = "y";
   "CONFIG_FB_CMDLINE" = "y";
   "CONFIG_FB_CFB_FILLRECT" = "y";
   "CONFIG_FB_CFB_COPYAREA" = "y";
   "CONFIG_FB_CFB_IMAGEBLIT" = "y";
-  "CONFIG_FB_SYS_FILLRECT" = "m";
-  "CONFIG_FB_SYS_COPYAREA" = "m";
-  "CONFIG_FB_SYS_IMAGEBLIT" = "m";
+  "CONFIG_FB_SYS_FILLRECT" = "y";
+  "CONFIG_FB_SYS_COPYAREA" = "y";
+  "CONFIG_FB_SYS_IMAGEBLIT" = "y";
+  "CONFIG_FB_SYS_FOPS" = "y";
   "CONFIG_FB_BACKLIGHT" = "y";
   "CONFIG_FB_MODE_HELPERS" = "y";
   "CONFIG_FB_TILEBLITTING" = "y";
@@ -730,6 +741,7 @@
   "CONFIG_HID_CHICONY" = "y";
   "CONFIG_HID_CYPRESS" = "y";
   "CONFIG_HID_EZKEY" = "y";
+  "CONFIG_HID_GEMBIRD" = "m";
   "CONFIG_HID_KENSINGTON" = "y";
   "CONFIG_HID_LOGITECH" = "y";
   "CONFIG_HID_MICROSOFT" = "y";
@@ -854,6 +866,7 @@
   "CONFIG_X86_PLATFORM_DEVICES" = "y";
   "CONFIG_ACPI_WMI" = "y";
   "CONFIG_MXM_WMI" = "y";
+  "CONFIG_SURFACE_PRO3_BUTTON" = "m";
   "CONFIG_CLKEVT_I8253" = "y";
   "CONFIG_I8253_LOCK" = "y";
   "CONFIG_CLKBLD_I8253" = "y";
@@ -1064,6 +1077,7 @@
   "CONFIG_CRYPTO_USER" = "m";
   "CONFIG_CRYPTO_GF128MUL" = "y";
   "CONFIG_CRYPTO_NULL" = "y";
+  "CONFIG_CRYPTO_NULL2" = "y";
   "CONFIG_CRYPTO_PCRYPT" = "y";
   "CONFIG_CRYPTO_WORKQUEUE" = "y";
   "CONFIG_CRYPTO_CRYPTD" = "y";
@@ -1096,6 +1110,7 @@
   "CONFIG_CRYPTO_CRCT10DIF_PCLMUL" = "m";
   "CONFIG_CRYPTO_GHASH" = "y";
   "CONFIG_CRYPTO_POLY1305" = "m";
+  "CONFIG_CRYPTO_POLY1305_X86_64" = "m";
   "CONFIG_CRYPTO_MD4" = "y";
   "CONFIG_CRYPTO_MD5" = "y";
   "CONFIG_CRYPTO_MICHAEL_MIC" = "y";
@@ -1137,6 +1152,7 @@
   "CONFIG_CRYPTO_SALSA20" = "m";
   "CONFIG_CRYPTO_SALSA20_X86_64" = "m";
   "CONFIG_CRYPTO_CHACHA20" = "m";
+  "CONFIG_CRYPTO_CHACHA20_X86_64" = "m";
   "CONFIG_CRYPTO_SEED" = "m";
   "CONFIG_CRYPTO_SERPENT" = "y";
   "CONFIG_CRYPTO_SERPENT_SSE2_X86_64" = "y";
@@ -1171,6 +1187,8 @@
   "CONFIG_X509_CERTIFICATE_PARSER" = "m";
   "CONFIG_PKCS7_MESSAGE_PARSER" = "m";
   "CONFIG_PKCS7_TEST_KEY" = "m";
+  "CONFIG_SYSTEM_TRUSTED_KEYRING" = "y";
+  "CONFIG_SYSTEM_TRUSTED_KEYS" = "";
   "CONFIG_HAVE_KVM" = "y";
   "CONFIG_HAVE_KVM_IRQCHIP" = "y";
   "CONFIG_HAVE_KVM_IRQFD" = "y";
@@ -1196,7 +1214,6 @@
   "CONFIG_GENERIC_PCI_IOMAP" = "y";
   "CONFIG_GENERIC_IOMAP" = "y";
   "CONFIG_GENERIC_IO" = "y";
-  "CONFIG_PERCPU_RWSEM" = "y";
   "CONFIG_ARCH_USE_CMPXCHG_LOCKREF" = "y";
   "CONFIG_ARCH_HAS_FAST_MULTIPLIER" = "y";
   "CONFIG_CRC_CCITT" = "y";
@@ -1234,6 +1251,7 @@
   "CONFIG_DECOMPRESS_XZ" = "y";
   "CONFIG_DECOMPRESS_LZO" = "y";
   "CONFIG_DECOMPRESS_LZ4" = "y";
+  "CONFIG_GENERIC_ALLOCATOR" = "y";
   "CONFIG_TEXTSEARCH" = "y";
   "CONFIG_TEXTSEARCH_KMP" = "m";
   "CONFIG_TEXTSEARCH_BM" = "m";
@@ -1248,7 +1266,6 @@
   "CONFIG_GLOB" = "y";
   "CONFIG_NLATTR" = "y";
   "CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE" = "y";
-  "CONFIG_AVERAGE" = "y";
   "CONFIG_CLZ_TAB" = "y";
   "CONFIG_CORDIC" = "y";
   "CONFIG_MPILIB" = "m";
@@ -1258,4 +1275,5 @@
   "CONFIG_FONT_8x16" = "y";
   "CONFIG_ARCH_HAS_SG_CHAIN" = "y";
   "CONFIG_ARCH_HAS_PMEM_API" = "y";
+  "CONFIG_ARCH_HAS_MMIO_FLUSH" = "y";
 }