diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:28:33 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:31:28 +0300 |
commit | 193236933b0f4ab91b1625b64e2187e2db4e0e8f (patch) | |
tree | e12769d7c76d8b0517d6de3d3c72189753d253ed /meta-openembedded/meta-python/recipes-devtools/python/python-pyflame-1.6.6/0001-ptrace-Abstract-over-user_regs_struct-name-which-dif.patch | |
parent | bd93df9478f2f56ffcbc8cb88f1709c735dcd85b (diff) | |
download | openbmc-193236933b0f4ab91b1625b64e2187e2db4e0e8f.tar.xz |
reset upstream subtrees to HEAD
Reset the following subtrees on HEAD:
poky: 8217b477a1(master)
meta-xilinx: 64aa3d35ae(master)
meta-openembedded: 0435c9e193(master)
meta-raspberrypi: 490a4441ac(master)
meta-security: cb6d1c85ee(master)
Squashed patches:
meta-phosphor: drop systemd 239 patches
meta-phosphor: mrw-api: use correct install path
Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-python/recipes-devtools/python/python-pyflame-1.6.6/0001-ptrace-Abstract-over-user_regs_struct-name-which-dif.patch')
-rw-r--r-- | meta-openembedded/meta-python/recipes-devtools/python/python-pyflame-1.6.6/0001-ptrace-Abstract-over-user_regs_struct-name-which-dif.patch | 69 |
1 files changed, 0 insertions, 69 deletions
diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-pyflame-1.6.6/0001-ptrace-Abstract-over-user_regs_struct-name-which-dif.patch b/meta-openembedded/meta-python/recipes-devtools/python/python-pyflame-1.6.6/0001-ptrace-Abstract-over-user_regs_struct-name-which-dif.patch deleted file mode 100644 index 09c4394c2..000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python-pyflame-1.6.6/0001-ptrace-Abstract-over-user_regs_struct-name-which-dif.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 2ef124e235a47dd4742813cf80e11a89cf4f02f8 Mon Sep 17 00:00:00 2001 -From: Andrew Jeffery <andrew@aj.id.au> -Date: Thu, 3 May 2018 12:35:31 +0930 -Subject: [PATCH] ptrace: Abstract over user_regs_struct name, which differs on - ARM32 - -Signed-off-by: Andrew Jeffery <andrew@aj.id.au> ---- - src/ptrace.cc | 6 +++--- - src/ptrace.h | 10 ++++++++-- - 2 files changed, 11 insertions(+), 5 deletions(-) - -diff --git a/src/ptrace.cc b/src/ptrace.cc -index 485f58e4d82e..610fabb3b8e8 100644 ---- a/src/ptrace.cc -+++ b/src/ptrace.cc -@@ -122,8 +122,8 @@ void PtraceInterrupt(pid_t pid) { - DoWait(pid); - } - --struct user_regs_struct PtraceGetRegs(pid_t pid) { -- struct user_regs_struct regs; -+user_regs_struct PtraceGetRegs(pid_t pid) { -+ user_regs_struct regs; - if (ptrace(PTRACE_GETREGS, pid, 0, ®s)) { - std::ostringstream ss; - ss << "Failed to PTRACE_GETREGS: " << strerror(errno); -@@ -132,7 +132,7 @@ struct user_regs_struct PtraceGetRegs(pid_t pid) { - return regs; - } - --void PtraceSetRegs(pid_t pid, struct user_regs_struct regs) { -+void PtraceSetRegs(pid_t pid, user_regs_struct regs) { - if (ptrace(PTRACE_SETREGS, pid, 0, ®s)) { - std::ostringstream ss; - ss << "Failed to PTRACE_SETREGS: " << strerror(errno); -diff --git a/src/ptrace.h b/src/ptrace.h -index 7083be1c4dfd..d6af8bf9f83a 100644 ---- a/src/ptrace.h -+++ b/src/ptrace.h -@@ -23,6 +23,12 @@ - - #include "./config.h" - -+#if defined(__arm__) -+typedef struct user_regs user_regs_struct; -+#else -+typedef struct user_regs_struct user_regs_struct; -+#endif -+ - namespace pyflame { - - int DoWait(pid_t pid, int options = 0); -@@ -39,10 +45,10 @@ void PtraceSeize(pid_t pid); - void PtraceInterrupt(pid_t pid); - - // get regs from a process --struct user_regs_struct PtraceGetRegs(pid_t pid); -+user_regs_struct PtraceGetRegs(pid_t pid); - - // set regs in a process --void PtraceSetRegs(pid_t pid, struct user_regs_struct regs); -+void PtraceSetRegs(pid_t pid, user_regs_struct regs); - - // poke a long word into an address - void PtracePoke(pid_t pid, unsigned long addr, long data); --- -2.14.1 - |