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

Commit 324670b6 authored by Masami Hiramatsu's avatar Masami Hiramatsu Committed by Ingo Molnar
Browse files

kprobes: Move __kprobes definition into compiler.h 



Currently, __kprobes is defined in linux/kprobes.h which
is too big to be included in small or basic headers
that want to make use of this simple attribute.

So move __kprobes definition into linux/compiler.h
in which other compiler attributes are defined.

Signed-off-by: default avatarMasami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Timo Juhani Lindfors <timo.lindfors@iki.fi>
Cc: Ananth N Mavinakayanahalli <ananth@in.ibm.com>
Cc: Pavel Emelyanov <xemul@parallels.com>
Cc: Jiri Kosina <jkosina@suse.cz>
Cc: Nadia Yvette Chambers <nyc@holomorphy.com>
Cc: yrl.pp-manager.tt@hitachi.com
Cc: David S. Miller <davem@davemloft.net>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Link: http://lkml.kernel.org/r/20130404104049.21071.20908.stgit@mhiramat-M0-7522


[ Improved the attribute explanation a bit. ]
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent cc2f5a8a

include/linux/compiler.h

+6 −0
Original line number Original line Diff line number Diff line
@@ -351,4 +351,10 @@ void ftrace_likely_update(struct ftrace_branch_data *f, int val, int expect); 
 */

 */

#define ACCESS_ONCE(x) (*(volatile typeof(x) *)&(x))

#define ACCESS_ONCE(x) (*(volatile typeof(x) *)&(x))





/* Ignore/forbid kprobes attach on very low level functions marked by this attribute: */

#ifdef CONFIG_KPROBES

# define __kprobes	__attribute__((__section__(".kprobes.text")))

#else

# define __kprobes

#endif

#endif /* __LINUX_COMPILER_H */
 
#endif /* __LINUX_COMPILER_H */

include/linux/kprobes.h

+1 −5
Original line number Original line Diff line number Diff line
@@ -29,6 +29,7 @@ 
 *		<jkenisto@us.ibm.com>  and Prasanna S Panchamukhi

 *		<jkenisto@us.ibm.com>  and Prasanna S Panchamukhi

 *		<prasanna@in.ibm.com> added function-return probes.

 *		<prasanna@in.ibm.com> added function-return probes.

 */

 */

#include <linux/compiler.h>	/* for __kprobes */

#include <linux/linkage.h>

#include <linux/linkage.h>

#include <linux/list.h>

#include <linux/list.h>

#include <linux/notifier.h>

#include <linux/notifier.h>
@@ -49,16 +50,11 @@ 
#define KPROBE_REENTER		0x00000004

#define KPROBE_REENTER		0x00000004

#define KPROBE_HIT_SSDONE	0x00000008

#define KPROBE_HIT_SSDONE	0x00000008





/* Attach to insert probes on any functions which should be ignored*/

#define __kprobes	__attribute__((__section__(".kprobes.text")))



#else /* CONFIG_KPROBES */

#else /* CONFIG_KPROBES */

typedef int kprobe_opcode_t;

typedef int kprobe_opcode_t;

struct arch_specific_insn {

struct arch_specific_insn {

	int dummy;

	int dummy;

};

};

#define __kprobes



#endif /* CONFIG_KPROBES */

#endif /* CONFIG_KPROBES */





struct kprobe;

struct kprobe;