From fc5c00cb68d503193eac5c59bb4e74f84abb3525 Mon Sep 17 00:00:00 2001 From: Vasilito Date: Mon, 4 May 2026 18:35:45 +0100 Subject: [PATCH] fix: remove P7-scheduler-improvements from kernel recipe patches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit P7 failed 3/4 hunks on context.rs at kernel rev 866dfad0. Consolidated patch already includes P5-sched-rt-policy, P5-context-mod-sched, P6-percpu-runqueues, P6-futex-sharding which cover most scheduler improvements. P7 needs rebase — documented in recipe comment. Verified: full 'make r.kernel' fetch+patch+build chain works: git clone + consolidated.patch + P8-msi.patch + cargo build → 1.5MB kernel --- recipes/core/kernel/recipe.toml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/recipes/core/kernel/recipe.toml b/recipes/core/kernel/recipe.toml index 62df31b1..b67294af 100644 --- a/recipes/core/kernel/recipe.toml +++ b/recipes/core/kernel/recipe.toml @@ -12,13 +12,15 @@ # P8-percpu-wiring, P8-percpu-sched, P8-load-balance, P8-work-stealing, # P9-futex-pi-cas-fix) failed to apply at commit 866dfad0 due to # context conflicts and are deferred until rebase. +# P7-scheduler-improvements.patch: removed from recipe patches — 3/4 hunks +# fail on context.rs at 866dfad0. Rebase needed. # P8-msi (applies separately): T1.1 msi.rs (message composition/validation/capability # parsing), T1.2 vector.rs (per-CPU bitmatrix allocation), T1.3 IRQ scheme MSI # validation gate + iommu hook, T2.2 kernel-side IRQ affinity handler. [source] git = "https://gitlab.redox-os.org/redox-os/kernel.git" rev = "866dfad0" -patches = ["../../../local/patches/kernel/redbear-consolidated.patch", "../../../local/patches/kernel/P7-scheduler-improvements.patch", "../../../local/patches/kernel/P8-msi.patch"] +patches = ["../../../local/patches/kernel/redbear-consolidated.patch", "../../../local/patches/kernel/P8-msi.patch"] [build] template = "custom"