summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2014-05-07 22:47:17 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-05-07 22:47:17 +0000
commit1f64d7e14c0e6c8f5b142d6eb942608f2951f4a7 (patch)
treea314e3427a19e9fd2dc15c283abe3077c709abac
parentb59e7e6b2165809e971a754796d766e1de2bd324 (diff)
parentb48661289ad5b31afd2fa6e406caa0dca1c80230 (diff)
downloadsystem_core-1f64d7e14c0e6c8f5b142d6eb942608f2951f4a7.zip
system_core-1f64d7e14c0e6c8f5b142d6eb942608f2951f4a7.tar.gz
system_core-1f64d7e14c0e6c8f5b142d6eb942608f2951f4a7.tar.bz2
am b4866128: Merge "Fix mips debuggerd <corkscrew/ptrace.h> build breakage."
* commit 'b48661289ad5b31afd2fa6e406caa0dca1c80230': Fix mips debuggerd <corkscrew/ptrace.h> build breakage.
-rw-r--r--debuggerd/mips/machine.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/debuggerd/mips/machine.cpp b/debuggerd/mips/machine.cpp
index 7b4e29e..ab34182 100644
--- a/debuggerd/mips/machine.cpp
+++ b/debuggerd/mips/machine.cpp
@@ -22,8 +22,6 @@
#include <sys/types.h>
#include <sys/ptrace.h>
-#include <corkscrew/ptrace.h>
-
#include <sys/user.h>
#include "../utility.h"
@@ -37,7 +35,7 @@
// If configured to do so, dump memory around *all* registers
// for the crashing thread.
void dump_memory_and_code(log_t* log, pid_t tid, int scope_flags) {
- pt_regs_mips_t r;
+ pt_regs r;
if (ptrace(PTRACE_GETREGS, tid, 0, &r)) {
return;
}
@@ -80,7 +78,7 @@ void dump_memory_and_code(log_t* log, pid_t tid, int scope_flags) {
}
void dump_registers(log_t* log, pid_t tid, int scope_flags) {
- pt_regs_mips_t r;
+ pt_regs r;
if(ptrace(PTRACE_GETREGS, tid, 0, &r)) {
_LOG(log, scope_flags, "cannot get registers: %s\n", strerror(errno));
return;