summary refs log tree commit diff
path: root/pkgs/os-specific/linux/kernel/common-config.nix
diff options
context:
space:
mode:
authorAtemu <atemu.main@gmail.com>2022-07-07 14:24:33 +0200
committerAtemu <atemu.main@gmail.com>2022-07-07 14:40:17 +0200
commitb5ee4eca8e232a0fc9fc7dcd3cc31b60f6710024 (patch)
tree5066ad7a24a2076c99e431ca0aa16c7314bdc866 /pkgs/os-specific/linux/kernel/common-config.nix
parenta5c867d9fe9e4380452628e8f171c26b69fa9d3d (diff)
downloadnixpkgs-b5ee4eca8e232a0fc9fc7dcd3cc31b60f6710024.tar
nixpkgs-b5ee4eca8e232a0fc9fc7dcd3cc31b60f6710024.tar.gz
nixpkgs-b5ee4eca8e232a0fc9fc7dcd3cc31b60f6710024.tar.bz2
nixpkgs-b5ee4eca8e232a0fc9fc7dcd3cc31b60f6710024.tar.lz
nixpkgs-b5ee4eca8e232a0fc9fc7dcd3cc31b60f6710024.tar.xz
nixpkgs-b5ee4eca8e232a0fc9fc7dcd3cc31b60f6710024.tar.zst
nixpkgs-b5ee4eca8e232a0fc9fc7dcd3cc31b60f6710024.zip
linux: disable ASHMEM on >= 5.18
Dropped by upstream, see
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=721412ed3d819e767cac2b06646bf03aa158aaec

It was marked as optional, so it didn't break our builds but resulted in:

    warning: unused option: ASHMEM

Explicitly disable ASHMEM on kernels >=5.18 for clarity and fewer warnings
Diffstat (limited to 'pkgs/os-specific/linux/kernel/common-config.nix')
-rw-r--r--pkgs/os-specific/linux/kernel/common-config.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 5f0d5d38099..74db399841a 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -911,7 +911,7 @@ let
 
       FSL_MC_UAPI_SUPPORT = mkIf (stdenv.hostPlatform.system == "aarch64-linux") (whenAtLeast "5.12" yes);
 
-      ASHMEM =                 { optional = true; tristate = whenAtLeast "5.0" "y";};
+      ASHMEM =                 { optional = true; tristate = whenBetween "5.0" "5.18" "y";};
       ANDROID =                { optional = true; tristate = whenAtLeast "5.0" "y";};
       ANDROID_BINDER_IPC =     { optional = true; tristate = whenAtLeast "5.0" "y";};
       ANDROID_BINDERFS =       { optional = true; tristate = whenAtLeast "5.0" "y";};