colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #180516 from Atemu/kernel-disable-ashmem

Browse Source 
linux: disable ASHMEM on >= 5.18
This commit is contained in:
Martin Weinelt 2022-07-14 23:20:26 +02:00 committed by GitHub
commit b2d57db6c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/virtualisation/waydroid.nix
View File

@ -34,7 +34,7 @@ in
system.requiredKernelConfig = with config.lib.kernelConfig; [
(isEnabled "ANDROID_BINDER_IPC")
(isEnabled "ANDROID_BINDERFS")
(isEnabled "ASHMEM")
(isEnabled "ASHMEM") # FIXME Needs memfd support instead on Linux 5.18 and waydroid 1.2.1
];
/* NOTE: we always enable this flag even if CONFIG_PSI_DEFAULT_DISABLED is not on

2
pkgs/os-specific/linux/kernel/common-config.nix
View File

@ -913,7 +913,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";};