about summary refs log tree commit diff
path: root/machines
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2013-02-25 12:48:52 +0100
committeraszlig <aszlig@redmoonstudios.org>2013-02-25 12:48:52 +0100
commit8e48ccd638c57521c0828d8ec53874aa9ba7ddcc (patch)
tree08ff11d5449678b0acf0558d473d846a6c2453b6 /machines
parente23a53e59422d986ec6c3bcb5f0c61f42e579a7e (diff)
kernel/mmrnmhrm: Update kernel to latest master.
This updates the kernel source to the latest version in Linus' tree and adds the
new config options to mmrnmhrm's configuration.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'machines')
-rw-r--r--machines/mmrnmhrm-kconf.nix6
1 files changed, 5 insertions, 1 deletions
diff --git a/machines/mmrnmhrm-kconf.nix b/machines/mmrnmhrm-kconf.nix
index 0afc8c35..528e7fcd 100644
--- a/machines/mmrnmhrm-kconf.nix
+++ b/machines/mmrnmhrm-kconf.nix
@@ -180,7 +180,8 @@
   "CONFIG_HAVE_IRQ_TIME_ACCOUNTING" = "y";
   "CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE" = "y";
   "CONFIG_MODULES_USE_ELF_RELA" = "y";
-  "CONFIG_GENERIC_SIGALTSTACK" = "y";
+  "CONFIG_OLD_SIGSUSPEND3" = "y";
+  "CONFIG_COMPAT_OLD_SIGACTION" = "y";
   "CONFIG_SLABINFO" = "y";
   "CONFIG_RT_MUTEXES" = "y";
   "CONFIG_BASE_SMALL" = "0";
@@ -249,6 +250,9 @@
   "CONFIG_MICROCODE" = "y";
   "CONFIG_MICROCODE_INTEL" = "y";
   "CONFIG_MICROCODE_OLD_INTERFACE" = "y";
+  "CONFIG_MICROCODE_INTEL_LIB" = "y";
+  "CONFIG_MICROCODE_INTEL_EARLY" = "y";
+  "CONFIG_MICROCODE_EARLY" = "y";
   "CONFIG_X86_MSR" = "m";
   "CONFIG_X86_CPUID" = "m";
   "CONFIG_ARCH_PHYS_ADDR_T_64BIT" = "y";