lkml.org 
[lkml]   [2008]   [Feb]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    SubjectRe: [PATCH] kprobes: remove sparse warnings from x86
    From
    Date
    On Thu, 2008-02-14 at 10:08 -0500, Masami Hiramatsu wrote:
    > Harvey Harrison :
    > > 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 <harvey.harrison@gmail.com>
    >
    > It looks good to me.
    >
    > Acked-by: Masami Hiramatsu <mhiramat@redhat.com>
    >
    > Thank you,
    >

    Ingo, could you take this in x86.git?

    Harvey


    From: Harvey Harrison <harvey.harrison@gmail.com>
    Subject: [PATCH] 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.

    Acked-by: Masami Hiramatsu <mhiramat@redhat.com>
    Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
    ---
    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;
    --
    1.5.4.1.1278.gc75be




    \
     
     \ /
      Last update: 2008-02-14 19:03    [W:0.049 / U:0.440 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site