From 4c0b25aba18f65bd28bcce3f44e25b5310b22f2c Mon Sep 17 00:00:00 2001
From: Tony Luck <tony.luck@intel.com>
Date: Wed, 6 Jan 2010 15:52:35 -0800
Subject: [PATCH] --- yaml --- r: 178877 b: refs/heads/master c:
 410dc0aac63d1500faeabcbaecce4f4266380ed1 h: refs/heads/master i:   178875:
 acaa08fa6b6d237d6f3fa742ca1d03f4cdfc1869 v: v3

---
 [refs]                                | 2 +-
 trunk/arch/ia64/include/asm/ftrace.h  | 1 -
 trunk/arch/ia64/include/asm/kprobes.h | 5 -----
 trunk/arch/ia64/include/asm/types.h   | 5 +++++
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 3f7f023d5725..e04e95016d4b 100644
--- 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
index d20db3c2a656..fbd1a2470cae 100644
--- 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
index dbf83fb28db3..d5505d6f2382 100644
--- 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
index bcd260e597de..b8e5d97be158 100644
--- 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
  */