From: Alexander Kanavin <alex@linutronix.de>
Date: Wed, 19 Jun 2024 08:59:49 +0000 (+0200)
Subject: psmisc: remove 0001-Use-UINTPTR_MAX-instead-of-__WORDSIZE.patch
X-Git-Tag: uninative-4.6~240
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a4bca6412d109eadbb7f754fb4cf4ea4be1f6ba;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git

psmisc: remove 0001-Use-UINTPTR_MAX-instead-of-__WORDSIZE.patch

Somewhere on the way it ceased to be needed (checked on musl).

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-extended/psmisc/psmisc/0001-Use-UINTPTR_MAX-instead-of-__WORDSIZE.patch b/meta/recipes-extended/psmisc/psmisc/0001-Use-UINTPTR_MAX-instead-of-__WORDSIZE.patch
deleted file mode 100644
index 01335bdf405..00000000000
--- a/meta/recipes-extended/psmisc/psmisc/0001-Use-UINTPTR_MAX-instead-of-__WORDSIZE.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 338d2d46d1c20ebadf317938af98d0532a62f8d4 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 24 Mar 2016 15:46:14 +0000
-Subject: [PATCH] Use UINTPTR_MAX instead of __WORDSIZE
-
-Do not include sys/user.h since it conflicts with
-pt_regs struct from kernel APIs in asm/ptrace.h
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Upstream-Status: Pending
----
- src/peekfd.c | 13 ++++++++-----
- 1 file changed, 8 insertions(+), 5 deletions(-)
-
-diff --git a/src/peekfd.c b/src/peekfd.c
-index 36dff04..2b4b1dc 100644
---- a/src/peekfd.c
-+++ b/src/peekfd.c
-@@ -30,8 +30,11 @@
- #include <asm/ptrace.h>
- #include <byteswap.h>
- #include <endian.h>
-+#ifdef __GLIBC__
- #include <sys/user.h>
-+#endif
- #include <stdlib.h>
-+#include <stdint.h>
- #include <getopt.h>
- #include <ctype.h>
- #include <dirent.h>
-@@ -341,11 +344,11 @@ int main(int argc, char **argv)
- 		if (WIFSTOPPED(status)) {
- #ifdef PPC
- 			struct pt_regs regs;
--			regs.gpr[0] = ptrace(PTRACE_PEEKUSER, pid, __WORDSIZE/8 * PT_R0, 0);
--			regs.gpr[3] = ptrace(PTRACE_PEEKUSER, pid, __WORDSIZE/8 * PT_R3, 0);
--			regs.gpr[4] = ptrace(PTRACE_PEEKUSER, pid, __WORDSIZE/8 * PT_R4, 0);
--			regs.gpr[5] = ptrace(PTRACE_PEEKUSER, pid, __WORDSIZE/8 * PT_R5, 0);
--			regs.orig_gpr3 = ptrace(PTRACE_PEEKUSER, pid, __WORDSIZE/8 * PT_ORIG_R3, 0);
-+			regs.gpr[0] = ptrace(PTRACE_PEEKUSER, pid, UINTPTR_MAX/8 * PT_R0, 0);
-+			regs.gpr[3] = ptrace(PTRACE_PEEKUSER, pid, UINTPTR_MAX/8 * PT_R3, 0);
-+			regs.gpr[4] = ptrace(PTRACE_PEEKUSER, pid, UINTPTR_MAX/8 * PT_R4, 0);
-+			regs.gpr[5] = ptrace(PTRACE_PEEKUSER, pid, UINTPTR_MAX/8 * PT_R5, 0);
-+			regs.orig_gpr3 = ptrace(PTRACE_PEEKUSER, pid, UINTPTR_MAX/8 * PT_ORIG_R3, 0);
- #elif defined(ARM)
- 			struct pt_regs regs;
- 			ptrace(PTRACE_GETREGS, pid, 0, &regs);
diff --git a/meta/recipes-extended/psmisc/psmisc_23.7.bb b/meta/recipes-extended/psmisc/psmisc_23.7.bb
index d96eaf5fe8a..4128ca05335 100644
--- a/meta/recipes-extended/psmisc/psmisc_23.7.bb
+++ b/meta/recipes-extended/psmisc/psmisc_23.7.bb
@@ -13,7 +13,6 @@ LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
 
 SRC_URI = "git://gitlab.com/psmisc/psmisc.git;protocol=https;branch=master \
-           file://0001-Use-UINTPTR_MAX-instead-of-__WORDSIZE.patch \
            "
 SRCREV = "9091d6dbcce3d8fb87adf9249a2eb346d25a562c"
 S = "${WORKDIR}/git"