Merge pull request #132162 from NixOS/backport-132100-to-release-21.05

[Backport release-21.05] linux/common-config.nix: disable LPAE on armv7l-linux
NixOS · Jul 30, 2021 · a8d7cc1 · a8d7cc1
2 parents 84d9062 + cab8dfb
commit a8d7cc1
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -878,8 +878,6 @@ let
       # Keeping it a built-in ensures it will be used if possible.
       FB_SIMPLE = yes;
 
-    } // optionalAttrs (stdenv.hostPlatform.system == "armv7l-linux") {
-      ARM_LPAE = yes;
     };
   };
 in