---

yaml --- r: 3264 b: refs/heads/master c: 84dd8d7 h: refs/heads/master v: v3
git-mirror · Jun 25, 2005 · f6192d0 · f6192d0
1 parent 96bd72e
commit f6192d0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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