---

yaml --- r: 178877 b: refs/heads/master c: 410dc0a h: refs/heads/master i: 178875: acaa08f v: v3
git-mirror · Jan 6, 2010 · 4c0b25a · 4c0b25a
1 parent 1817abf
commit 4c0b25a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 02b763b8ccc88d030117851f2b76a119932f109e
+refs/heads/master: 410dc0aac63d1500faeabcbaecce4f4266380ed1
diff --git a/trunk/arch/ia64/include/asm/ftrace.h b/trunk/arch/ia64/include/asm/ftrace.h
@@ -8,7 +8,6 @@
 extern void _mcount(unsigned long pfs, unsigned long r1, unsigned long b0, unsigned long r0);
 #define mcount _mcount
 
-#include <asm/kprobes.h>
 /* In IA64, MCOUNT_ADDR is set in link time, so it's not a constant at compile time */
 #define MCOUNT_ADDR (((struct fnptr *)mcount)->ip)
 #define FTRACE_ADDR (((struct fnptr *)ftrace_caller)->ip)

diff --git a/trunk/arch/ia64/include/asm/kprobes.h b/trunk/arch/ia64/include/asm/kprobes.h
@@ -103,11 +103,6 @@ typedef struct kprobe_opcode {
 	bundle_t bundle;
 } kprobe_opcode_t;
 
-struct fnptr {
-	unsigned long ip;
-	unsigned long gp;
-};
-
 /* Architecture specific copy of original instruction*/
 struct arch_specific_insn {
 	/* copy of the instruction to be emulated */

diff --git a/trunk/arch/ia64/include/asm/types.h b/trunk/arch/ia64/include/asm/types.h
@@ -30,6 +30,11 @@
 
 typedef unsigned int umode_t;
 
+struct fnptr {
+	unsigned long ip;
+	unsigned long gp;
+};
+
 /*
  * These aren't exported outside the kernel to avoid name space clashes
  */