Currently, __kprobes is defined in linux/kprobes.h which
is too big to be included in small or basic headers
only for using this attribute.
This moves __kprobes definition into linux/compiler.h
in which other compiler attributes are defined.
Signed-off-by: Masami Hiramatsu <masami.hiramatsu...@hitachi.com>
Cc: Timo Juhani Lindfors <timo.lindf...@iki.fi>
Cc: Ananth N Mavinakayanahalli <ana...@in.ibm.com>
Cc: "David S. Miller" <da...@davemloft.net>
Cc: Nadia Yvette Chambers <n...@holomorphy.com>
Cc: Pavel Emelyanov <xe...@parallels.com>
Cc: Jiri Kosina <jkos...@suse.cz>
Cc: Ingo Molnar <mi...@kernel.org>
---
include/linux/compiler.h | 6 ++++++
include/linux/kprobes.h | 6 +-----
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/include/linux/compiler.h b/include/linux/compiler.h
index 10b8f23..9382db2 100644
--- a/include/linux/compiler.h
+++ b/include/linux/compiler.h
@@ -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))
+#ifdef CONFIG_KPROBES
+/* Attach to insert probes on any functions which should be ignored */
+#define __kprobes __attribute__((__section__(".kprobes.text")))
+#else
+#define __kprobes
+#endif
#endif /* __LINUX_COMPILER_H */
diff --git a/include/linux/kprobes.h b/include/linux/kprobes.h
index 4b6ef4d..ca1d27a 100644
--- a/include/linux/kprobes.h
+++ b/include/linux/kprobes.h
@@ -29,6 +29,7 @@
* <jkeni...@us.ibm.com> and Prasanna S Panchamukhi
* <prasa...@in.ibm.com> added function-return probes.
*/
+#include <linux/compiler.h> /* for __kprobes */
#include <linux/linkage.h>
#include <linux/list.h>
#include <linux/notifier.h>
@@ -49,16 +50,11 @@
#define KPROBE_REENTER 0x00000004
#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 */
typedef int kprobe_opcode_t;
struct arch_specific_insn {
int dummy;
};
-#define __kprobes
-
#endif /* CONFIG_KPROBES */
struct kprobe;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
