Unverified Commit d61b866e authored by Thiago Kenji Okada's avatar Thiago Kenji Okada Committed by GitHub
Browse files

Merge pull request #298049 from wfdewith/fix-kernels 

kernel: fix builds for linux_lqx and linux_{4_19,5_4}_hardened
parents ad9440ea 7feed229

pkgs/os-specific/linux/dpdk-kmods/default.nix

+0 −1
Original line number Diff line number Diff line
@@ -32,6 +32,5 @@ stdenv.mkDerivation rec { 
    license = licenses.gpl2Only;

    maintainers = [ maintainers.mic92 ];

    platforms = platforms.linux;

    broken = kernel.isHardened;

  };

}

pkgs/os-specific/linux/kernel/generic.nix

+5 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
, rustPlatform

, rust-bindgen

, nixosTests

}:

}@args':



lib.makeOverridable ({ # The kernel source tarball.

  src
@@ -68,6 +68,10 @@ lib.makeOverridable ({ # The kernel source tarball. 
, preferBuiltin ? stdenv.hostPlatform.linux-kernel.preferBuiltin or false

, kernelArch ? stdenv.hostPlatform.linuxArch

, kernelTests ? []



, stdenv ? args'.stdenv

, buildPackages ? args'.buildPackages



, ...

}@args:

pkgs/os-specific/linux/kernel/zen-kernels.nix

+2 −0
Original line number Diff line number Diff line
@@ -93,6 +93,8 @@ let 
      RT_GROUP_SCHED = lib.mkForce (option no);

      SCHED_AUTOGROUP = lib.mkForce (option no);

      SCHED_CORE = lib.mkForce (option no);

      UCLAMP_TASK = lib.mkForce (option no);

      UCLAMP_TASK_GROUP = lib.mkForce (option no);



      # ERROR: modpost: "sched_numa_hop_mask" [drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.ko] undefined!

      MLX5_CORE = no;