lkml.org 
[lkml]   [2010]   [Sep]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:perf/core] kprobes: Remove __dummy_buf
    Commit-ID:  6abded71d730322df96c5b7f4ab952ffd5a0080d
    Gitweb: http://git.kernel.org/tip/6abded71d730322df96c5b7f4ab952ffd5a0080d
    Author: Namhyung Kim <namhyung@gmail.com>
    AuthorDate: Wed, 15 Sep 2010 10:04:29 +0900
    Committer: Ingo Molnar <mingo@elte.hu>
    CommitDate: Wed, 15 Sep 2010 10:44:02 +0200

    kprobes: Remove __dummy_buf

    Remove __dummy_buf which is needed for kallsyms_lookup only.
    use kallsysm_lookup_size_offset instead.

    Signed-off-by: Namhyung Kim <namhyung@gmail.com>
    Acked-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
    LKML-Reference: <1284512670-2369-5-git-send-email-namhyung@gmail.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    ---
    arch/x86/kernel/kprobes.c | 9 ++-------
    1 files changed, 2 insertions(+), 7 deletions(-)

    diff --git a/arch/x86/kernel/kprobes.c b/arch/x86/kernel/kprobes.c
    index 05c20a4..e05952a 100644
    --- a/arch/x86/kernel/kprobes.c
    +++ b/arch/x86/kernel/kprobes.c
    @@ -230,9 +230,6 @@ static int recover_probed_instruction(kprobe_opcode_t *buf, unsigned long addr)
    return 0;
    }

    -/* Dummy buffers for kallsyms_lookup */
    -static char __dummy_buf[KSYM_NAME_LEN];
    -
    /* Check if paddr is at an instruction boundary */
    static int __kprobes can_probe(unsigned long paddr)
    {
    @@ -241,7 +238,7 @@ static int __kprobes can_probe(unsigned long paddr)
    struct insn insn;
    kprobe_opcode_t buf[MAX_INSN_SIZE];

    - if (!kallsyms_lookup(paddr, NULL, &offset, NULL, __dummy_buf))
    + if (!kallsyms_lookup_size_offset(paddr, NULL, &offset))
    return 0;

    /* Decode instructions */
    @@ -1269,11 +1266,9 @@ static int __kprobes can_optimize(unsigned long paddr)
    unsigned long addr, size = 0, offset = 0;
    struct insn insn;
    kprobe_opcode_t buf[MAX_INSN_SIZE];
    - /* Dummy buffers for lookup_symbol_attrs */
    - static char __dummy_buf[KSYM_NAME_LEN];

    /* Lookup symbol including addr */
    - if (!kallsyms_lookup(paddr, &size, &offset, NULL, __dummy_buf))
    + if (!kallsyms_lookup_size_offset(paddr, &size, &offset))
    return 0;

    /* Check there is enough space for a relative jump. */

    \
     
     \ /
      Last update: 2010-09-15 12:07    [W:0.051 / U:89.700 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site