From f8d353e785fc6f995074ac3bf0b164b68a646c3b Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 14 Sep 2013 19:22:54 +0200 Subject: Update source/config to latest mainline kernel. This updates the configs of both machines to the latest kernel. Signed-off-by: aszlig --- machines/dnyarri-kconf.nix | 5 ++++- machines/mmrnmhrm-kconf.nix | 6 ++---- 2 files changed, 6 insertions(+), 5 deletions(-) (limited to 'machines') diff --git a/machines/dnyarri-kconf.nix b/machines/dnyarri-kconf.nix index f7412aae..051083fb 100644 --- a/machines/dnyarri-kconf.nix +++ b/machines/dnyarri-kconf.nix @@ -109,8 +109,10 @@ "CONFIG_NAMESPACES" = "y"; "CONFIG_UTS_NS" = "y"; "CONFIG_IPC_NS" = "y"; + "CONFIG_USER_NS" = "y"; "CONFIG_PID_NS" = "y"; "CONFIG_NET_NS" = "y"; + "CONFIG_UIDGID_STRICT_TYPE_CHECKS" = "y"; "CONFIG_SCHED_AUTOGROUP" = "y"; "CONFIG_RELAY" = "y"; "CONFIG_BLK_DEV_INITRD" = "y"; @@ -339,7 +341,6 @@ "CONFIG_PCIEAER" = "y"; "CONFIG_PCIEASPM" = "y"; "CONFIG_PCIEASPM_PERFORMANCE" = "y"; - "CONFIG_ARCH_SUPPORTS_MSI" = "y"; "CONFIG_PCI_MSI" = "y"; "CONFIG_HT_IRQ" = "y"; "CONFIG_PCI_LABEL" = "y"; @@ -1190,6 +1191,8 @@ "CONFIG_CRYPTO_CRC32C_INTEL" = "y"; "CONFIG_CRYPTO_CRC32" = "y"; "CONFIG_CRYPTO_CRC32_PCLMUL" = "y"; + "CONFIG_CRYPTO_CRCT10DIF" = "y"; + "CONFIG_CRYPTO_CRCT10DIF_PCLMUL" = "m"; "CONFIG_CRYPTO_GHASH" = "y"; "CONFIG_CRYPTO_MD4" = "y"; "CONFIG_CRYPTO_MD5" = "y"; diff --git a/machines/mmrnmhrm-kconf.nix b/machines/mmrnmhrm-kconf.nix index e8193589..3a8ab9cf 100644 --- a/machines/mmrnmhrm-kconf.nix +++ b/machines/mmrnmhrm-kconf.nix @@ -56,8 +56,6 @@ "CONFIG_POSIX_MQUEUE" = "y"; "CONFIG_POSIX_MQUEUE_SYSCTL" = "y"; "CONFIG_FHANDLE" = "y"; - "CONFIG_HAVE_GENERIC_HARDIRQS" = "y"; - "CONFIG_GENERIC_HARDIRQS" = "y"; "CONFIG_GENERIC_IRQ_PROBE" = "y"; "CONFIG_GENERIC_IRQ_SHOW" = "y"; "CONFIG_GENERIC_PENDING_IRQ" = "y"; @@ -113,7 +111,6 @@ "CONFIG_USER_NS" = "y"; "CONFIG_PID_NS" = "y"; "CONFIG_NET_NS" = "y"; - "CONFIG_UIDGID_CONVERTED" = "y"; "CONFIG_UIDGID_STRICT_TYPE_CHECKS" = "y"; "CONFIG_SCHED_AUTOGROUP" = "y"; "CONFIG_RELAY" = "y"; @@ -345,7 +342,6 @@ "CONFIG_PCIEAER" = "y"; "CONFIG_PCIEASPM" = "y"; "CONFIG_PCIEASPM_PERFORMANCE" = "y"; - "CONFIG_ARCH_SUPPORTS_MSI" = "y"; "CONFIG_PCI_MSI" = "y"; "CONFIG_HT_IRQ" = "y"; "CONFIG_PCI_LABEL" = "y"; @@ -998,6 +994,8 @@ "CONFIG_CRYPTO_CRC32C_INTEL" = "y"; "CONFIG_CRYPTO_CRC32" = "y"; "CONFIG_CRYPTO_CRC32_PCLMUL" = "y"; + "CONFIG_CRYPTO_CRCT10DIF" = "y"; + "CONFIG_CRYPTO_CRCT10DIF_PCLMUL" = "y"; "CONFIG_CRYPTO_GHASH" = "y"; "CONFIG_CRYPTO_MD4" = "y"; "CONFIG_CRYPTO_MD5" = "y"; -- cgit 1.4.1