lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[IA64] sanity in #include files. Move fnptr to types.h

Browse Source 
Signed-off-by: Tony Luck <tony.luck@intel.com>
This commit is contained in:
Tony Luck
2010-01-06 15:52:35 -08:00
parent 02b763b8cc
commit 410dc0aac6
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/ia64/include/asm/ftrace.h
View File

@@ -8,7 +8,6 @@
extern void _mcount(unsigned long pfs, unsigned long r1, unsigned long b0, unsigned long r0); extern void _mcount(unsigned long pfs, unsigned long r1, unsigned long b0, unsigned long r0);
#define mcount _mcount #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 */ /* 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 MCOUNT_ADDR (((struct fnptr *)mcount)->ip)
#define FTRACE_ADDR (((struct fnptr *)ftrace_caller)->ip) #define FTRACE_ADDR (((struct fnptr *)ftrace_caller)->ip)

5
arch/ia64/include/asm/kprobes.h
View File

@@ -103,11 +103,6 @@ typedef struct kprobe_opcode {
bundle_t bundle; bundle_t bundle;
} kprobe_opcode_t; } kprobe_opcode_t;
struct fnptr {
unsigned long ip;
unsigned long gp;
};
/* Architecture specific copy of original instruction*/ /* Architecture specific copy of original instruction*/
struct arch_specific_insn { struct arch_specific_insn {
/* copy of the instruction to be emulated */ /* copy of the instruction to be emulated */

5
arch/ia64/include/asm/types.h
View File

@@ -30,6 +30,11 @@
typedef unsigned int umode_t; 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 * These aren't exported outside the kernel to avoid name space clashes
*/ */