diff options
Diffstat (limited to 'gnu/packages/patches/qemu-glibc-2.41.patch')
-rw-r--r-- | gnu/packages/patches/qemu-glibc-2.41.patch | 52 |
1 files changed, 0 insertions, 52 deletions
diff --git a/gnu/packages/patches/qemu-glibc-2.41.patch b/gnu/packages/patches/qemu-glibc-2.41.patch deleted file mode 100644 index 56beab690e..0000000000 --- a/gnu/packages/patches/qemu-glibc-2.41.patch +++ /dev/null @@ -1,52 +0,0 @@ -from https://gitlab.com/qemu-project/qemu/-/commit/27a8d899c7a100fd5aa040a8b993bb257687c393 - -From 27a8d899c7a100fd5aa040a8b993bb257687c393 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 7 Feb 2025 16:09:20 +0000 -Subject: [PATCH] linux-user: Do not define struct sched_attr if libc headers - do - -glibc 2.41+ has added [1] definitions for sched_setattr and -sched_getattr functions and struct sched_attr. Therefore, it needs -to be checked for here as well before defining sched_attr, to avoid -a compilation failure. - -Define sched_attr conditionally only when SCHED_ATTR_SIZE_VER0 is -not defined. - -[1] https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=21571ca0d70302909cf72707b2a7736cf12190a0;hp=298bc488fdc047da37482f4003023cb9adef78f8 - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2799 -Cc: qemu-stable@nongnu.org -Reviewed-by: Peter Maydell <peter.maydell@linaro.org> -Signed-off-by: Peter Maydell <peter.maydell@linaro.org> ---- - linux-user/syscall.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index 6ee02383daf..df5ed18062c 100644 ---- a/linux-user/syscall.c -+++ b/linux-user/syscall.c -@@ -360,7 +360,8 @@ _syscall3(int, sys_sched_getaffinity, pid_t, pid, unsigned int, len, - #define __NR_sys_sched_setaffinity __NR_sched_setaffinity - _syscall3(int, sys_sched_setaffinity, pid_t, pid, unsigned int, len, - unsigned long *, user_mask_ptr); --/* sched_attr is not defined in glibc */ -+/* sched_attr is not defined in glibc < 2.41 */ -+#ifndef SCHED_ATTR_SIZE_VER0 - struct sched_attr { - uint32_t size; - uint32_t sched_policy; -@@ -373,6 +374,7 @@ struct sched_attr { - uint32_t sched_util_min; - uint32_t sched_util_max; - }; -+#endif - #define __NR_sys_sched_getattr __NR_sched_getattr - _syscall4(int, sys_sched_getattr, pid_t, pid, struct sched_attr *, attr, - unsigned int, size, unsigned int, flags); --- -GitLab - |