From 08bd281625d378dc384f146dde6fff6fa6d648ff Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 24 Dec 2012 11:45:41 +0100
Subject: mmrnmhrm: Update kernel config to version 3.8.0.

This is still somewhat tedious to do because we need to revert
7e62e31f9f2bba0864ee8dd05b490c17387f5322, rebuild the nix file and then reset
the revert.

So, let's see when I start getting annouyed by this ;-)

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

(limited to 'machines')

diff --git a/machines/mmrnmhrm-kconf.nix b/machines/mmrnmhrm-kconf.nix
index cb252fb5..629e53d1 100644
--- a/machines/mmrnmhrm-kconf.nix
+++ b/machines/mmrnmhrm-kconf.nix
@@ -93,6 +93,8 @@
   "CONFIG_IKCONFIG_PROC" = "y";
   "CONFIG_LOG_BUF_SHIFT" = "17";
   "CONFIG_HAVE_UNSTABLE_SCHED_CLOCK" = "y";
+  "CONFIG_ARCH_SUPPORTS_NUMA_BALANCING" = "y";
+  "CONFIG_ARCH_WANTS_PROT_NUMA_PROT_NONE" = "y";
   "CONFIG_CGROUPS" = "y";
   "CONFIG_CGROUP_FREEZER" = "y";
   "CONFIG_CGROUP_DEVICE" = "y";
@@ -169,14 +171,13 @@
   "CONFIG_HAVE_CMPXCHG_DOUBLE" = "y";
   "CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION" = "y";
   "CONFIG_ARCH_WANT_OLD_COMPAT_IPC" = "y";
-  "CONFIG_GENERIC_KERNEL_THREAD" = "y";
-  "CONFIG_GENERIC_KERNEL_EXECVE" = "y";
   "CONFIG_HAVE_ARCH_SECCOMP_FILTER" = "y";
   "CONFIG_SECCOMP_FILTER" = "y";
   "CONFIG_HAVE_CONTEXT_TRACKING" = "y";
   "CONFIG_HAVE_IRQ_TIME_ACCOUNTING" = "y";
   "CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE" = "y";
   "CONFIG_MODULES_USE_ELF_RELA" = "y";
+  "CONFIG_GENERIC_SIGALTSTACK" = "y";
   "CONFIG_SLABINFO" = "y";
   "CONFIG_RT_MUTEXES" = "y";
   "CONFIG_BASE_SMALL" = "0";
@@ -191,6 +192,7 @@
   "CONFIG_BLK_DEV_INTEGRITY" = "y";
   "CONFIG_BLK_DEV_THROTTLING" = "y";
   "CONFIG_MSDOS_PARTITION" = "y";
+  "CONFIG_EFI_PARTITION" = "y";
   "CONFIG_BLOCK_COMPAT" = "y";
   "CONFIG_IOSCHED_NOOP" = "y";
   "CONFIG_IOSCHED_DEADLINE" = "y";
@@ -315,6 +317,7 @@
   "CONFIG_ACPI_THERMAL" = "y";
   "CONFIG_ACPI_NUMA" = "y";
   "CONFIG_ACPI_CUSTOM_DSDT_FILE" = "";
+  "CONFIG_ACPI_INITRD_TABLE_OVERRIDE" = "y";
   "CONFIG_ACPI_BLACKLIST_YEAR" = "0";
   "CONFIG_X86_PM_TIMER" = "y";
   "CONFIG_ACPI_HED" = "y";
@@ -510,6 +513,7 @@
   "CONFIG_I2C_I801" = "y";
   "CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB" = "y";
   "CONFIG_POWER_SUPPLY" = "y";
+  "CONFIG_POWER_RESET" = "y";
   "CONFIG_HWMON" = "y";
   "CONFIG_SENSORS_CORETEMP" = "y";
   "CONFIG_THERMAL" = "y";
@@ -615,6 +619,7 @@
   "CONFIG_HID_SENSOR_HUB" = "m";
   "CONFIG_USB_HID" = "y";
   "CONFIG_USB_HIDDEV" = "y";
+  "CONFIG_I2C_HID" = "m";
   "CONFIG_USB_ARCH_HAS_OHCI" = "y";
   "CONFIG_USB_ARCH_HAS_EHCI" = "y";
   "CONFIG_USB_ARCH_HAS_XHCI" = "y";
@@ -789,7 +794,7 @@
   "CONFIG_TMPFS_XATTR" = "y";
   "CONFIG_CONFIGFS_FS" = "y";
   "CONFIG_MISC_FILESYSTEMS" = "y";
-  "CONFIG_ECRYPT_FS" = "m";
+  "CONFIG_ECRYPT_FS" = "y";
   "CONFIG_SQUASHFS" = "m";
   "CONFIG_SQUASHFS_XATTR" = "y";
   "CONFIG_SQUASHFS_ZLIB" = "y";
@@ -891,7 +896,6 @@
   "CONFIG_TRACING_SUPPORT" = "y";
   "CONFIG_HAVE_ARCH_KGDB" = "y";
   "CONFIG_HAVE_ARCH_KMEMCHECK" = "y";
-  "CONFIG_TEST_KSTRTOX" = "m";
   "CONFIG_STRICT_DEVMEM" = "y";
   "CONFIG_X86_VERBOSE_BOOTUP" = "y";
   "CONFIG_EARLY_PRINTK" = "y";
@@ -903,7 +907,7 @@
   "CONFIG_IO_DELAY_0X80" = "y";
   "CONFIG_DEFAULT_IO_DELAY_TYPE" = "0";
   "CONFIG_KEYS" = "y";
-  "CONFIG_ENCRYPTED_KEYS" = "m";
+  "CONFIG_ENCRYPTED_KEYS" = "y";
   "CONFIG_KEYS_DEBUG_PROC_KEYS" = "y";
   "CONFIG_DEFAULT_SECURITY_DAC" = "y";
   "CONFIG_DEFAULT_SECURITY" = "";
@@ -943,9 +947,10 @@
   "CONFIG_CRYPTO_PCBC" = "y";
   "CONFIG_CRYPTO_XTS" = "y";
   "CONFIG_CRYPTO_HMAC" = "y";
-  "CONFIG_CRYPTO_XCBC" = "m";
-  "CONFIG_CRYPTO_VMAC" = "m";
+  "CONFIG_CRYPTO_XCBC" = "y";
+  "CONFIG_CRYPTO_VMAC" = "y";
   "CONFIG_CRYPTO_CRC32C" = "y";
+  "CONFIG_CRYPTO_CRC32C_X86_64" = "y";
   "CONFIG_CRYPTO_CRC32C_INTEL" = "y";
   "CONFIG_CRYPTO_GHASH" = "y";
   "CONFIG_CRYPTO_MD4" = "y";
@@ -971,7 +976,9 @@
   "CONFIG_CRYPTO_BLOWFISH_COMMON" = "y";
   "CONFIG_CRYPTO_BLOWFISH_X86_64" = "y";
   "CONFIG_CRYPTO_CAMELLIA" = "m";
-  "CONFIG_CRYPTO_CAMELLIA_X86_64" = "m";
+  "CONFIG_CRYPTO_CAMELLIA_X86_64" = "y";
+  "CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64" = "y";
+  "CONFIG_CRYPTO_CAST_COMMON" = "y";
   "CONFIG_CRYPTO_CAST5" = "y";
   "CONFIG_CRYPTO_CAST5_AVX_X86_64" = "y";
   "CONFIG_CRYPTO_CAST6" = "y";
@@ -1021,6 +1028,7 @@
   "CONFIG_GENERIC_PCI_IOMAP" = "y";
   "CONFIG_GENERIC_IOMAP" = "y";
   "CONFIG_GENERIC_IO" = "y";
+  "CONFIG_PERCPU_RWSEM" = "y";
   "CONFIG_CRC_CCITT" = "y";
   "CONFIG_CRC16" = "y";
   "CONFIG_CRC_T10DIF" = "y";
-- 
cgit 1.4.1