about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--machines/mmrnmhrm-kconf.nix2
-rw-r--r--overrides/default.nix6
2 files changed, 4 insertions, 4 deletions
diff --git a/machines/mmrnmhrm-kconf.nix b/machines/mmrnmhrm-kconf.nix
index cf30621f..8a22a94b 100644
--- a/machines/mmrnmhrm-kconf.nix
+++ b/machines/mmrnmhrm-kconf.nix
@@ -177,6 +177,7 @@
   "CONFIG_HAVE_CMPXCHG_DOUBLE" = "y";
   "CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION" = "y";
   "CONFIG_ARCH_WANT_OLD_COMPAT_IPC" = "y";
+  "CONFIG_HAVE_VIRT_TO_BUS" = "y";
   "CONFIG_HAVE_ARCH_SECCOMP_FILTER" = "y";
   "CONFIG_SECCOMP_FILTER" = "y";
   "CONFIG_HAVE_CONTEXT_TRACKING" = "y";
@@ -1051,7 +1052,6 @@
   "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";
diff --git a/overrides/default.nix b/overrides/default.nix
index 8e947170..fcaaa17d 100644
--- a/overrides/default.nix
+++ b/overrides/default.nix
@@ -56,11 +56,11 @@ let
   # misc
   misc = {
     kernelSourceAszlig = {
-      version = "3.8.0";
+      version = "3.9.0-pre-rc1";
       src = everything.fetchgit {
         url = /home/aszlig/linux;
-        rev = "e3c4877de8b9d93bd47b6ee88eb594b1c1e10da5";
-        sha256 = "1f1wn5nqi2kldn5cqa4waaaf7jjipd5ry8fa1vqj8chvhijlxb45";
+        rev = "79de04ca251a0b063e55d66eeb2e2248bd1ad97f";
+        sha256 = "1zmyg8qzr2xs50f5gz0s2yhgj8la8bfrgrrsqinsba28d8p480sg";
       };
     };