From 791b970c6ecfec6ab18f4638bd659424cbc56c3c Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 4 Mar 2015 15:38:17 +0100 Subject: [PATCH] linux/kernel: Remove EXT2_FS_XIP for version 4.0. The option has been removed in torvalds/linux@6cd176a and thus we shouldn't try to set it for kernel version 4. Signed-off-by: aszlig --- pkgs/os-specific/linux/kernel/common-config.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 909813ddddf2..0843ecf9bb83 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -151,7 +151,9 @@ with stdenv.lib; EXT2_FS_XATTR y EXT2_FS_POSIX_ACL y EXT2_FS_SECURITY y - EXT2_FS_XIP y # Ext2 execute in place support + ${optionalString (versionOlder version "4.0") '' + EXT2_FS_XIP y # Ext2 execute in place support + ''} EXT3_FS_POSIX_ACL y EXT3_FS_SECURITY y EXT4_FS_POSIX_ACL y