Commit:     f1452d424dc0e079fb97af8cb8d3a0f7b5fddd46
Parent:     08cd93f9e11ac8c3e42c72debe7dc55a761149c2
Author:     Harvey Harrison <[EMAIL PROTECTED]>
AuthorDate: Thu Feb 14 15:23:53 2008 -0800
Committer:  Ingo Molnar <[EMAIL PROTECTED]>
CommitDate: Tue Feb 19 16:18:28 2008 +0100

    x86, kprobes: remove sparse warnings from x86
    arch/x86/kernel/kprobes.c:584:16: warning: symbol 
'kretprobe_trampoline_holder' was not declared. Should it be static?
    arch/x86/kernel/kprobes.c:676:6: warning: symbol 'trampoline_handler' was 
not declared. Should it be static?
    Make them static and add the __used attribute, approach taken from the
    arm kprobes implementation.
    kretprobe_trampoline_holder uses inline assemly to define the global
    symbol kretprobe_trampoline, but nothing ever calls the holder explicitly.
    trampoline handler is only called from inline assembly in the same file,
    mark it used and static.
    Signed-off-by: Harvey Harrison <[EMAIL PROTECTED]>
    Acked-by: Masami Hiramatsu <[EMAIL PROTECTED]>
    Signed-off-by: Ingo Molnar <[EMAIL PROTECTED]>
    Signed-off-by: Thomas Gleixner <[EMAIL PROTECTED]>
 arch/x86/kernel/kprobes.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kernel/kprobes.c b/arch/x86/kernel/kprobes.c
index a99e764..34a5912 100644
--- a/arch/x86/kernel/kprobes.c
+++ b/arch/x86/kernel/kprobes.c
@@ -581,7 +581,7 @@ static int __kprobes kprobe_handler(struct pt_regs *regs)
  * When a retprobed function returns, this code saves registers and
  * calls trampoline_handler() runs, which calls the kretprobe's handler.
-void __kprobes kretprobe_trampoline_holder(void)
+static void __used __kprobes kretprobe_trampoline_holder(void)
        asm volatile (
                        ".global kretprobe_trampoline\n"
@@ -673,7 +673,7 @@ void __kprobes kretprobe_trampoline_holder(void)
  * Called from kretprobe_trampoline
-void * __kprobes trampoline_handler(struct pt_regs *regs)
+static __used __kprobes void *trampoline_handler(struct pt_regs *regs)
        struct kretprobe_instance *ri = NULL;
        struct hlist_head *head, empty_rp;
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to