From d0203c506781049b196c922666cb70c41d8e7919 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 30 Jun 2014 07:28:34 +0200
Subject: Update kernel and configurations to v3.16.0-rc3.

Moving to a new office, of course when i need to reboot anyway it's time
for a new kernel, too.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 machines/mmrnmhrm-kconf.nix | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'machines/mmrnmhrm-kconf.nix')

diff --git a/machines/mmrnmhrm-kconf.nix b/machines/mmrnmhrm-kconf.nix
index 67afd0df..a19010be 100644
--- a/machines/mmrnmhrm-kconf.nix
+++ b/machines/mmrnmhrm-kconf.nix
@@ -35,6 +35,7 @@
   "CONFIG_X86_HT" = "y";
   "CONFIG_ARCH_HWEIGHT_CFLAGS" = "-fcall-saved-rdi -fcall-saved-rsi -fcall-saved-rdx -fcall-saved-rcx -fcall-saved-r8 -fcall-saved-r9 -fcall-saved-r10 -fcall-saved-r11";
   "CONFIG_ARCH_SUPPORTS_UPROBES" = "y";
+  "CONFIG_FIX_EARLYCON_MEM" = "y";
   "CONFIG_DEFCONFIG_LIST" = "/lib/modules/$UNAME_RELEASE/.config";
   "CONFIG_IRQ_WORK" = "y";
   "CONFIG_BUILDTIME_EXTABLE_SORT" = "y";
@@ -54,10 +55,12 @@
   "CONFIG_SYSVIPC_SYSCTL" = "y";
   "CONFIG_POSIX_MQUEUE" = "y";
   "CONFIG_POSIX_MQUEUE_SYSCTL" = "y";
+  "CONFIG_CROSS_MEMORY_ATTACH" = "y";
   "CONFIG_FHANDLE" = "y";
   "CONFIG_HAVE_ARCH_AUDITSYSCALL" = "y";
   "CONFIG_GENERIC_IRQ_PROBE" = "y";
   "CONFIG_GENERIC_IRQ_SHOW" = "y";
+  "CONFIG_GENERIC_IRQ_LEGACY_ALLOC_HWIRQ" = "y";
   "CONFIG_GENERIC_PENDING_IRQ" = "y";
   "CONFIG_IRQ_DOMAIN" = "y";
   "CONFIG_IRQ_FORCED_THREADING" = "y";
@@ -127,6 +130,7 @@
   "CONFIG_SYSCTL_EXCEPTION_TRACE" = "y";
   "CONFIG_HAVE_PCSPKR_PLATFORM" = "y";
   "CONFIG_UID16" = "y";
+  "CONFIG_SGETMASK_SYSCALL" = "y";
   "CONFIG_SYSFS_SYSCALL" = "y";
   "CONFIG_KALLSYMS" = "y";
   "CONFIG_PRINTK" = "y";
@@ -160,6 +164,7 @@
   "CONFIG_HAVE_KPROBES_ON_FTRACE" = "y";
   "CONFIG_HAVE_ARCH_TRACEHOOK" = "y";
   "CONFIG_HAVE_DMA_ATTRS" = "y";
+  "CONFIG_HAVE_DMA_CONTIGUOUS" = "y";
   "CONFIG_GENERIC_SMP_IDLE_THREAD" = "y";
   "CONFIG_HAVE_REGS_AND_STACK_ACCESS_API" = "y";
   "CONFIG_HAVE_DMA_API_DEBUG" = "y";
@@ -219,6 +224,8 @@
   "CONFIG_ASN1" = "m";
   "CONFIG_UNINLINE_SPIN_UNLOCK" = "y";
   "CONFIG_MUTEX_SPIN_ON_OWNER" = "y";
+  "CONFIG_ARCH_USE_QUEUE_RWLOCK" = "y";
+  "CONFIG_QUEUE_RWLOCK" = "y";
   "CONFIG_FREEZER" = "y";
   "CONFIG_ZONE_DMA" = "y";
   "CONFIG_SMP" = "y";
@@ -257,6 +264,8 @@
   "CONFIG_X86_MCE_INTEL" = "y";
   "CONFIG_X86_MCE_THRESHOLD" = "y";
   "CONFIG_X86_THERMAL_VECTOR" = "y";
+  "CONFIG_X86_16BIT" = "y";
+  "CONFIG_X86_ESPFIX64" = "y";
   "CONFIG_MICROCODE" = "y";
   "CONFIG_MICROCODE_INTEL" = "y";
   "CONFIG_MICROCODE_OLD_INTERFACE" = "y";
@@ -300,7 +309,6 @@
   "CONFIG_MEMORY_FAILURE" = "y";
   "CONFIG_TRANSPARENT_HUGEPAGE" = "y";
   "CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS" = "y";
-  "CONFIG_CROSS_MEMORY_ATTACH" = "y";
   "CONFIG_CLEANCACHE" = "y";
   "CONFIG_FRONTSWAP" = "y";
   "CONFIG_ZBUD" = "y";
@@ -366,6 +374,7 @@
   "CONFIG_SYSVIPC_COMPAT" = "y";
   "CONFIG_KEYS_COMPAT" = "y";
   "CONFIG_X86_DEV_DMA_OPS" = "y";
+  "CONFIG_IOSF_MBI" = "m";
   "CONFIG_NET" = "y";
   "CONFIG_PACKET" = "y";
   "CONFIG_PACKET_DIAG" = "m";
@@ -463,7 +472,6 @@
   "CONFIG_BPF_JIT" = "y";
   "CONFIG_NET_FLOW_LIMIT" = "y";
   "CONFIG_HAVE_BPF_JIT" = "y";
-  "CONFIG_UEVENT_HELPER_PATH" = "";
   "CONFIG_DEVTMPFS" = "y";
   "CONFIG_DEVTMPFS_MOUNT" = "y";
   "CONFIG_FW_LOADER" = "y";
@@ -543,7 +551,6 @@
   "CONFIG_VT_HW_CONSOLE_BINDING" = "y";
   "CONFIG_UNIX98_PTYS" = "y";
   "CONFIG_DEVKMEM" = "y";
-  "CONFIG_FIX_EARLYCON_MEM" = "y";
   "CONFIG_HVC_DRIVER" = "y";
   "CONFIG_VIRTIO_CONSOLE" = "m";
   "CONFIG_NVRAM" = "m";
-- 
cgit 1.4.1