nix/10.nixos-hardware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge pull request #1923 from a-fritsch/raspberry-pi/kernel-preempt-fix

Browse source 
raspberry-pi/common/kernel: fix preempt config on kernel >=6.18
This commit is contained in:
Doron Behar 2026-06-22 20:57:05 +00:00 • committed by GitHub
commit b6f52e2b2c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
raspberry-pi/common/kernel.nix
View file

@ -72,11 +72,18 @@ in
NLS_CODEPAGE_437 = lib.mkForce yes;
FB_SIMPLE = yes;
}
# arm64 vendor defconfigs (bcm2711, bcm2712) use full preempt;
# arm32 ones (bcmrpi, bcm2709) use voluntary preempt (nixpkgs default)
# nixpkgs defaults to lazy preempt on kernel version >=6.18
# arm64 vendor defconfigs (bcm2711, bcm2712) use full preempt
// lib.optionalAttrs (rpiVersion >= 3) {
PREEMPT = lib.mkForce yes;
PREEMPT_LAZY = lib.mkForce no;
PREEMPT_VOLUNTARY = lib.mkForce no;
}
# arm32 ones (bcmrpi, bcm2709) use voluntary preempt
// lib.optionalAttrs (rpiVersion < 3) {
PREEMPT = lib.mkForce no;
PREEMPT_LAZY = lib.mkForce no;
PREEMPT_VOLUNTARY = lib.mkForce yes;
};
extraMeta =