summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorMasami Hiramatsu <masami.hiramatsu.pt@hitachi.com>2014-04-17 04:18:42 -0400
committerIngo Molnar <mingo@kernel.org>2014-04-24 04:26:40 -0400
commitedafe3a56dbd42c499245b222e9f7e80099356e5 (patch)
treeb473bbd75015d4e69b80b6cd6603737181399e1e /kernel
parentb40a2cb6e0c218c6d0f12c7f7e683e75972973c1 (diff)
kprobes, sched: Use NOKPROBE_SYMBOL macro in sched
Use NOKPROBE_SYMBOL macro to protect functions from kprobes instead of __kprobes annotation in sched/core.c. Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com> Reviewed-by: Steven Rostedt <rostedt@goodmis.org> Cc: Peter Zijlstra <peterz@infradead.org> Signed-off-by: Ingo Molnar <mingo@kernel.org> Link: http://lkml.kernel.org/r/20140417081842.26341.83959.stgit@ltc230.yrl.intra.hitachi.co.jp
Diffstat (limited to 'kernel')
-rw-r--r--kernel/sched/core.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 6863631e8cd0..00781cc38047 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -2480,7 +2480,7 @@ notrace unsigned long get_parent_ip(unsigned long addr)
2480#if defined(CONFIG_PREEMPT) && (defined(CONFIG_DEBUG_PREEMPT) || \ 2480#if defined(CONFIG_PREEMPT) && (defined(CONFIG_DEBUG_PREEMPT) || \
2481 defined(CONFIG_PREEMPT_TRACER)) 2481 defined(CONFIG_PREEMPT_TRACER))
2482 2482
2483void __kprobes preempt_count_add(int val) 2483void preempt_count_add(int val)
2484{ 2484{
2485#ifdef CONFIG_DEBUG_PREEMPT 2485#ifdef CONFIG_DEBUG_PREEMPT
2486 /* 2486 /*
@@ -2506,8 +2506,9 @@ void __kprobes preempt_count_add(int val)
2506 } 2506 }
2507} 2507}
2508EXPORT_SYMBOL(preempt_count_add); 2508EXPORT_SYMBOL(preempt_count_add);
2509NOKPROBE_SYMBOL(preempt_count_add);
2509 2510
2510void __kprobes preempt_count_sub(int val) 2511void preempt_count_sub(int val)
2511{ 2512{
2512#ifdef CONFIG_DEBUG_PREEMPT 2513#ifdef CONFIG_DEBUG_PREEMPT
2513 /* 2514 /*
@@ -2528,6 +2529,7 @@ void __kprobes preempt_count_sub(int val)
2528 __preempt_count_sub(val); 2529 __preempt_count_sub(val);
2529} 2530}
2530EXPORT_SYMBOL(preempt_count_sub); 2531EXPORT_SYMBOL(preempt_count_sub);
2532NOKPROBE_SYMBOL(preempt_count_sub);
2531 2533
2532#endif 2534#endif
2533 2535