diff options
| author | Tony Luck <tony.luck@intel.com> | 2010-01-06 15:52:35 -0800 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2010-01-06 15:52:35 -0800 |
| commit | 410dc0aac63d1500faeabcbaecce4f4266380ed1 (patch) | |
| tree | 463c8c4fbea9beb5881211ffcf88aa1ee03d296f | |
| parent | 02b763b8ccc88d030117851f2b76a119932f109e (diff) | |
| download | op-kernel-dev-410dc0aac63d1500faeabcbaecce4f4266380ed1.zip op-kernel-dev-410dc0aac63d1500faeabcbaecce4f4266380ed1.tar.gz | |
[IA64] sanity in #include files. Move fnptr to types.h
Signed-off-by: Tony Luck <tony.luck@intel.com>
| -rw-r--r-- | arch/ia64/include/asm/ftrace.h | 1 | ||||
| -rw-r--r-- | arch/ia64/include/asm/kprobes.h | 5 | ||||
| -rw-r--r-- | arch/ia64/include/asm/types.h | 5 |
3 files changed, 5 insertions, 6 deletions
diff --git a/arch/ia64/include/asm/ftrace.h b/arch/ia64/include/asm/ftrace.h index d20db3c..fbd1a24 100644 --- a/arch/ia64/include/asm/ftrace.h +++ b/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/arch/ia64/include/asm/kprobes.h b/arch/ia64/include/asm/kprobes.h index dbf83fb..d5505d6 100644 --- a/arch/ia64/include/asm/kprobes.h +++ b/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/arch/ia64/include/asm/types.h b/arch/ia64/include/asm/types.h index bcd260e..b8e5d97 100644 --- a/arch/ia64/include/asm/types.h +++ b/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 */ |
