Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 410dc0aa authored by Tony Luck's avatar Tony Luck
Browse files

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



Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent 02b763b8

arch/ia64/include/asm/ftrace.h

+0 −1
Original line number Diff line number Diff line
@@ -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)

arch/ia64/include/asm/kprobes.h

+0 −5
Original line number Diff line number Diff line
@@ -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 */

arch/ia64/include/asm/types.h

+5 −0
Original line number Diff line number Diff line
@@ -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

 */