gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2025-12-21 21:17:37 -08:00
Code Issues Projects Releases Wiki Activity

sys-kernel/scx: remove unused patches

Browse Source 
Signed-off-by: Michael Mair-Keimberger <mm1ke@gentoo.org>
This commit is contained in:
Michael Mair-Keimberger 2025-11-23 18:54:22 +01:00
parent 2fef667543
commit f44f5eb85c
No known key found for this signature in database
GPG Key ID: 03B489CBE4B76101
2 changed files with 0 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
sys-kernel/scx/files/scx-1.0.12-musl-ioctl.patch
View File

@ -1,33 +0,0 @@
Upstream-PR: https://github.com/sched-ext/scx/pull/1860
From 47622a1081ff849d224dc925752a4d860c217c4e Mon Sep 17 00:00:00 2001
From: Violet Purcell <vimproved@inventati.org>
Date: Sun, 11 May 2025 16:08:49 -0400
Subject: [PATCH] scx_utils: cast ioctl opcodes to libc::Ioctl
The opcode type that ioctl() accepts can differ between platforms,
namely between glibc where it accepts an unsigned 32-bit int, and musl
where it accepts a signed 32-bit int. Either way, the underlying value
of the opcode is a 32-bit integer. Currently, bindgen is storing the
enum values defined in perf_bindings.h as u32, which is fine for glibc,
but not musl (which wants an i32). This commit casts the opcodes to
libc::Ioctl before passing them to fix this.
--- a/rust/scx_utils/src/perf.rs
+++ b/rust/scx_utils/src/perf.rs
@@ -52,11 +52,11 @@ pub mod ioctls {
#[allow(clippy::missing_safety_doc)]
pub unsafe fn enable(fd: c_int, arg: c_uint) -> c_int {
- unsafe { libc::ioctl(fd, perf::bindings::ENABLE.into(), arg) }
+ unsafe { libc::ioctl(fd, perf::bindings::ENABLE as libc::Ioctl, arg) }
}
#[allow(clippy::missing_safety_doc)]
pub unsafe fn reset(fd: c_int, arg: c_uint) -> c_int {
- unsafe { libc::ioctl(fd, perf::bindings::RESET.into(), arg) }
+ unsafe { libc::ioctl(fd, perf::bindings::RESET as libc::Ioctl, arg) }
}
}
--
2.49.0

16
sys-kernel/scx/files/scx-1.0.14-builtin-preserve-enum-value.patch
View File

@ -1,16 +0,0 @@
This patch is made obsolete by https://github.com/sched-ext/scx/commit/7d9b2cc26473526883297df78e8eee3f2e7b6194.
--- a/lib/scxtest/overrides.h
+++ b/lib/scxtest/overrides.h
@@ -13,7 +13,11 @@
* that we want to get rid of that belongs here.
*/
#define __builtin_preserve_field_info(x,y) 1
+#ifdef __clang__
+#define __builtin_preserve_enum_value(x,y) 1
+#else
#define __builtin_preserve_enum_value(x,y,z) 1
+#endif
#define bpf_addr_space_cast(var, dst_as, src_as)