From d0d4a8cab96e6ebd8c182068995ea31570fa996f Mon Sep 17 00:00:00 2001 From: Tim Schumacher Date: Sun, 23 Feb 2025 19:57:24 +0100 Subject: [PATCH] linux/common-config: Guard transitive dependants on BTF_JIT BPF_JIT is not supported on i686, so we need to make sure that options that depend on BPF_JIT don't get enabled either. --- pkgs/os-specific/linux/kernel/common-config.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 30ce57a9e351..b66a2f6abaaa 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -1063,7 +1063,7 @@ let HIDRAW = yes; # Enable loading HID fixups as eBPF from userspace - HID_BPF = whenAtLeast "6.3" yes; + HID_BPF = whenAtLeast "6.3" (whenPlatformHasEBPFJit yes); HID_ACRUX_FF = yes; DRAGONRISE_FF = yes; @@ -1290,7 +1290,7 @@ let LIRC = yes; SCHED_CORE = whenAtLeast "5.14" yes; - SCHED_CLASS_EXT = whenAtLeast "6.12" yes; + SCHED_CLASS_EXT = whenAtLeast "6.12" (whenPlatformHasEBPFJit yes); LRU_GEN = whenAtLeast "6.1" yes; LRU_GEN_ENABLED = whenAtLeast "6.1" yes;