Ver Fonte

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>
Namhyung Kim há 14 anos atrás
pai
commit
6376b22975
2 ficheiros alterados com 4 adições e 3 exclusões
  1. 1 1
      arch/x86/kernel/kprobes.c
  2. 3 2
      kernel/kprobes.c

+ 1 - 1
arch/x86/kernel/kprobes.c

@@ -1129,7 +1129,7 @@ static void __kprobes synthesize_set_arg1(kprobe_opcode_t *addr,
 	*(unsigned long *)addr = val;
 	*(unsigned long *)addr = val;
 }
 }
 
 
-void __kprobes kprobes_optinsn_template_holder(void)
+static void __used __kprobes kprobes_optinsn_template_holder(void)
 {
 {
 	asm volatile (
 	asm volatile (
 			".global optprobe_template_entry\n"
 			".global optprobe_template_entry\n"

+ 3 - 2
kernel/kprobes.c

@@ -399,7 +399,7 @@ static inline int kprobe_optready(struct kprobe *p)
  * Return an optimized kprobe whose optimizing code replaces
  * Return an optimized kprobe whose optimizing code replaces
  * instructions including addr (exclude breakpoint).
  * instructions including addr (exclude breakpoint).
  */
  */
-struct kprobe *__kprobes get_optimized_kprobe(unsigned long addr)
+static struct kprobe *__kprobes get_optimized_kprobe(unsigned long addr)
 {
 {
 	int i;
 	int i;
 	struct kprobe *p = NULL;
 	struct kprobe *p = NULL;
@@ -857,7 +857,8 @@ void __kprobes kretprobe_hash_unlock(struct task_struct *tsk,
 	spin_unlock_irqrestore(hlist_lock, *flags);
 	spin_unlock_irqrestore(hlist_lock, *flags);
 }
 }
 
 
-void __kprobes kretprobe_table_unlock(unsigned long hash, unsigned long *flags)
+static void __kprobes kretprobe_table_unlock(unsigned long hash,
+       unsigned long *flags)
 {
 {
 	spinlock_t *hlist_lock = kretprobe_table_lock_ptr(hash);
 	spinlock_t *hlist_lock = kretprobe_table_lock_ptr(hash);
 	spin_unlock_irqrestore(hlist_lock, *flags);
 	spin_unlock_irqrestore(hlist_lock, *flags);