summaryrefslogtreecommitdiffstats
path: root/include/asm-um
diff options
context:
space:
mode:
authorPaolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>2005-06-25 14:55:26 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-25 16:24:36 -0700
commit84dd8d7e9c080b4db66b00b8bc36ccf09a90f824 (patch)
tree9307f2025dae93220d46eaca17b01d7945990e40 /include/asm-um
parent29d56cfe3ca599ddc3ae9156e7e469c044d97b96 (diff)
downloadlinux-84dd8d7e9c080b4db66b00b8bc36ccf09a90f824.tar.gz
linux-84dd8d7e9c080b4db66b00b8bc36ccf09a90f824.tar.bz2
linux-84dd8d7e9c080b4db66b00b8bc36ccf09a90f824.zip
[PATCH] uml: add profile_pc for i386
Cope with a conditional i386 definition, which is wrong for UML. Before we just used that one, but it wasn't defined for CONFIG_SMP, so in that case we got link errors. Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> Cc: Jeff Dike <jdike@addtoit.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/asm-um')
-rw-r--r--include/asm-um/ptrace-i386.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/asm-um/ptrace-i386.h b/include/asm-um/ptrace-i386.h
index 04222f35c43e..fe882b9d917e 100644
--- a/include/asm-um/ptrace-i386.h
+++ b/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