From 6f373fd16ec3d3f4a2acc90bd8fb4567b5978dfb Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 27 Feb 2015 16:10:01 +0100
Subject: Update kernel source and configs to v4.0-rc1.

Let's get rid of that buggy old 3.19-rc6 and get to the new buggy
4.0-rc1 + a few more commits (so it's more like -rc1.5).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 machines/mmrnmhrm-kconf.nix | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

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

diff --git a/machines/mmrnmhrm-kconf.nix b/machines/mmrnmhrm-kconf.nix
index 1584a53a..ac37de64 100644
--- a/machines/mmrnmhrm-kconf.nix
+++ b/machines/mmrnmhrm-kconf.nix
@@ -88,6 +88,7 @@
   "CONFIG_TASK_XACCT" = "y";
   "CONFIG_TASK_IO_ACCOUNTING" = "y";
   "CONFIG_PREEMPT_RCU" = "y";
+  "CONFIG_SRCU" = "y";
   "CONFIG_RCU_STALL_COMMON" = "y";
   "CONFIG_RCU_FANOUT" = "64";
   "CONFIG_RCU_FANOUT_LEAF" = "16";
@@ -232,6 +233,7 @@
   "CONFIG_ARCH_SUPPORTS_ATOMIC_RMW" = "y";
   "CONFIG_MUTEX_SPIN_ON_OWNER" = "y";
   "CONFIG_RWSEM_SPIN_ON_OWNER" = "y";
+  "CONFIG_LOCK_SPIN_ON_OWNER" = "y";
   "CONFIG_ARCH_USE_QUEUE_RWLOCK" = "y";
   "CONFIG_QUEUE_RWLOCK" = "y";
   "CONFIG_FREEZER" = "y";
@@ -268,6 +270,7 @@
   "CONFIG_SCHED_MC" = "y";
   "CONFIG_PREEMPT" = "y";
   "CONFIG_PREEMPT_COUNT" = "y";
+  "CONFIG_X86_UP_APIC_MSI" = "y";
   "CONFIG_X86_LOCAL_APIC" = "y";
   "CONFIG_X86_IO_APIC" = "y";
   "CONFIG_X86_MCE" = "y";
@@ -345,6 +348,7 @@
   "CONFIG_KEXEC_FILE" = "y";
   "CONFIG_PHYSICAL_START" = "0x1000000";
   "CONFIG_PHYSICAL_ALIGN" = "0x1000000";
+  "CONFIG_HAVE_LIVEPATCH" = "y";
   "CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG" = "y";
   "CONFIG_PM" = "y";
   "CONFIG_ACPI" = "y";
@@ -359,6 +363,7 @@
   "CONFIG_ACPI_CUSTOM_DSDT_FILE" = "";
   "CONFIG_ACPI_INITRD_TABLE_OVERRIDE" = "y";
   "CONFIG_X86_PM_TIMER" = "y";
+  "CONFIG_ACPI_HOTPLUG_IOAPIC" = "y";
   "CONFIG_ACPI_HED" = "y";
   "CONFIG_HAVE_ACPI_APEI" = "y";
   "CONFIG_HAVE_ACPI_APEI_NMI" = "y";
@@ -482,6 +487,7 @@
   "CONFIG_NET_ACT_SKBEDIT" = "m";
   "CONFIG_NET_ACT_CSUM" = "m";
   "CONFIG_NET_ACT_VLAN" = "m";
+  "CONFIG_NET_ACT_BPF" = "m";
   "CONFIG_NET_SCH_FIFO" = "y";
   "CONFIG_DNS_RESOLVER" = "y";
   "CONFIG_VSOCKETS" = "y";
@@ -577,6 +583,7 @@
   "CONFIG_VT_HW_CONSOLE_BINDING" = "y";
   "CONFIG_UNIX98_PTYS" = "y";
   "CONFIG_DEVPTS_MULTIPLE_INSTANCES" = "y";
+  "CONFIG_DEVMEM" = "y";
   "CONFIG_DEVKMEM" = "y";
   "CONFIG_HVC_DRIVER" = "y";
   "CONFIG_VIRTIO_CONSOLE" = "m";
@@ -658,6 +665,8 @@
   "CONFIG_VGACON_SOFT_SCROLLBACK" = "y";
   "CONFIG_VGACON_SOFT_SCROLLBACK_SIZE" = "1024";
   "CONFIG_DUMMY_CONSOLE" = "y";
+  "CONFIG_DUMMY_CONSOLE_COLUMNS" = "80";
+  "CONFIG_DUMMY_CONSOLE_ROWS" = "25";
   "CONFIG_FRAMEBUFFER_CONSOLE" = "y";
   "CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY" = "y";
   "CONFIG_SOUND" = "y";
@@ -805,6 +814,7 @@
   "CONFIG_USB_EZUSB_FX2" = "m";
   "CONFIG_NEW_LEDS" = "y";
   "CONFIG_LEDS_CLASS" = "y";
+  "CONFIG_LEDS_CLASS_FLASH" = "m";
   "CONFIG_EDAC" = "y";
   "CONFIG_EDAC_MM_EDAC" = "y";
   "CONFIG_EDAC_I82975X" = "y";
@@ -972,6 +982,8 @@
   "CONFIG_DEBUG_MEMORY_INIT" = "y";
   "CONFIG_HAVE_DEBUG_STACKOVERFLOW" = "y";
   "CONFIG_HAVE_ARCH_KMEMCHECK" = "y";
+  "CONFIG_HAVE_ARCH_KASAN" = "y";
+  "CONFIG_KASAN_SHADOW_OFFSET" = "0xdffffc0000000000";
   "CONFIG_PANIC_ON_OOPS_VALUE" = "0";
   "CONFIG_PANIC_TIMEOUT" = "0";
   "CONFIG_DEBUG_BUGVERBOSE" = "y";
@@ -988,6 +1000,7 @@
   "CONFIG_HAVE_FENTRY" = "y";
   "CONFIG_HAVE_C_RECORDMCOUNT" = "y";
   "CONFIG_TRACING_SUPPORT" = "y";
+  "CONFIG_TEST_HEXDUMP" = "m";
   "CONFIG_HAVE_ARCH_KGDB" = "y";
   "CONFIG_STRICT_DEVMEM" = "y";
   "CONFIG_X86_VERBOSE_BOOTUP" = "y";
@@ -1002,7 +1015,6 @@
   "CONFIG_DEFAULT_IO_DELAY_TYPE" = "0";
   "CONFIG_KEYS" = "y";
   "CONFIG_ENCRYPTED_KEYS" = "y";
-  "CONFIG_KEYS_DEBUG_PROC_KEYS" = "y";
   "CONFIG_SECURITYFS" = "y";
   "CONFIG_DEFAULT_SECURITY_DAC" = "y";
   "CONFIG_DEFAULT_SECURITY" = "";
@@ -1114,6 +1126,7 @@
   "CONFIG_CRYPTO_USER_API" = "m";
   "CONFIG_CRYPTO_USER_API_HASH" = "m";
   "CONFIG_CRYPTO_USER_API_SKCIPHER" = "m";
+  "CONFIG_CRYPTO_USER_API_RNG" = "m";
   "CONFIG_CRYPTO_HASH_INFO" = "y";
   "CONFIG_ASYMMETRIC_KEY_TYPE" = "m";
   "CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE" = "m";
@@ -1132,6 +1145,8 @@
   "CONFIG_HAVE_KVM_MSI" = "y";
   "CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT" = "y";
   "CONFIG_KVM_VFIO" = "y";
+  "CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT" = "y";
+  "CONFIG_KVM_COMPAT" = "y";
   "CONFIG_VIRTUALIZATION" = "y";
   "CONFIG_KVM" = "y";
   "CONFIG_KVM_INTEL" = "y";
-- 
cgit 1.4.1