diff options
author | Namhyung Kim <namhyung@gmail.com> | 2010-09-14 21:04:28 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2010-09-15 04:44:01 -0400 |
commit | 6376b2297502e72255b7eb2893c6044ad5a7b5f4 (patch) | |
tree | 8ceebb98c5a324580b1e9ce648ded86db2dd85fc | |
parent | 05662bdb64c746079de7ac4dc4fb4caa5e8e119f (diff) |
kprobes: Make functions static
Make following (internal) functions static to make sparse
happier :-)
* get_optimized_kprobe: only called from static functions
* kretprobe_table_unlock: _lock function is static
* kprobes_optinsn_template_holder: never called but holding asm code
Signed-off-by: Namhyung Kim <namhyung@gmail.com>
Acked-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
LKML-Reference: <1284512670-2369-4-git-send-email-namhyung@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r-- | arch/x86/kernel/kprobes.c | 2 | ||||
-rw-r--r-- | kernel/kprobes.c | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/arch/x86/kernel/kprobes.c b/arch/x86/kernel/kprobes.c index 770ebfb349e9..05c20a48841e 100644 --- a/arch/x86/kernel/kprobes.c +++ b/arch/x86/kernel/kprobes.c | |||
@@ -1129,7 +1129,7 @@ static void __kprobes synthesize_set_arg1(kprobe_opcode_t *addr, | |||
1129 | *(unsigned long *)addr = val; | 1129 | *(unsigned long *)addr = val; |
1130 | } | 1130 | } |
1131 | 1131 | ||
1132 | void __kprobes kprobes_optinsn_template_holder(void) | 1132 | static void __used __kprobes kprobes_optinsn_template_holder(void) |
1133 | { | 1133 | { |
1134 | asm volatile ( | 1134 | asm volatile ( |
1135 | ".global optprobe_template_entry\n" | 1135 | ".global optprobe_template_entry\n" |
diff --git a/kernel/kprobes.c b/kernel/kprobes.c index 1b0dbe067077..c53aad5d7e5e 100644 --- a/kernel/kprobes.c +++ b/kernel/kprobes.c | |||
@@ -399,7 +399,7 @@ static inline int kprobe_optready(struct kprobe *p) | |||
399 | * Return an optimized kprobe whose optimizing code replaces | 399 | * Return an optimized kprobe whose optimizing code replaces |
400 | * instructions including addr (exclude breakpoint). | 400 | * instructions including addr (exclude breakpoint). |
401 | */ | 401 | */ |
402 | struct kprobe *__kprobes get_optimized_kprobe(unsigned long addr) | 402 | static struct kprobe *__kprobes get_optimized_kprobe(unsigned long addr) |
403 | { | 403 | { |
404 | int i; | 404 | int i; |
405 | struct kprobe *p = NULL; | 405 | struct kprobe *p = NULL; |
@@ -857,7 +857,8 @@ void __kprobes kretprobe_hash_unlock(struct task_struct *tsk, | |||
857 | spin_unlock_irqrestore(hlist_lock, *flags); | 857 | spin_unlock_irqrestore(hlist_lock, *flags); |
858 | } | 858 | } |
859 | 859 | ||
860 | void __kprobes kretprobe_table_unlock(unsigned long hash, unsigned long *flags) | 860 | static void __kprobes kretprobe_table_unlock(unsigned long hash, |
861 | unsigned long *flags) | ||
861 | { | 862 | { |
862 | spinlock_t *hlist_lock = kretprobe_table_lock_ptr(hash); | 863 | spinlock_t *hlist_lock = kretprobe_table_lock_ptr(hash); |
863 | spin_unlock_irqrestore(hlist_lock, *flags); | 864 | spin_unlock_irqrestore(hlist_lock, *flags); |