From f6192d0c43752ae197ba94de5b1a67e25e81306c Mon Sep 17 00:00:00 2001
From: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Date: Sat, 25 Jun 2005 14:55:26 -0700
Subject: [PATCH] --- yaml --- r: 3264 b: refs/heads/master c:
 84dd8d7e9c080b4db66b00b8bc36ccf09a90f824 h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/include/asm-um/ptrace-i386.h | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 5ab237e6f918..6c11766e01a6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 29d56cfe3ca599ddc3ae9156e7e469c044d97b96
+refs/heads/master: 84dd8d7e9c080b4db66b00b8bc36ccf09a90f824
diff --git a/trunk/include/asm-um/ptrace-i386.h b/trunk/include/asm-um/ptrace-i386.h
index 04222f35c43e..fe882b9d917e 100644
--- a/trunk/include/asm-um/ptrace-i386.h
+++ b/trunk/include/asm-um/ptrace-i386.h
@@ -32,6 +32,10 @@
 #define PT_REGS_SYSCALL_RET(r) PT_REGS_EAX(r)
 #define PT_FIX_EXEC_STACK(sp) do ; while(0)
 
+/* Cope with a conditional i386 definition. */
+#undef profile_pc
+#define profile_pc(regs) PT_REGS_IP(regs)
+
 #define user_mode(r) UPT_IS_USER(&(r)->regs)
 
 #endif