lkml.org 
[lkml]   [2009]   [Dec]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 2/2] perf: Drop useless check for ignored frame
    Date
    The check that ignores the debug and nmi stack frames is useless
    now that we have a frame pointer that makes us start at the right
    place. We don't anymore have to deal with these.

    Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
    Cc: Paul Mackerras <paulus@samba.org>
    ---
    arch/x86/include/asm/stacktrace.h | 2 --
    arch/x86/kernel/cpu/perf_event.c | 8 --------
    arch/x86/kernel/dumpstack_32.c | 5 -----
    arch/x86/kernel/dumpstack_64.c | 5 -----
    4 files changed, 0 insertions(+), 20 deletions(-)

    diff --git a/arch/x86/include/asm/stacktrace.h b/arch/x86/include/asm/stacktrace.h
    index 35e8912..4dab78e 100644
    --- a/arch/x86/include/asm/stacktrace.h
    +++ b/arch/x86/include/asm/stacktrace.h
    @@ -3,8 +3,6 @@

    extern int kstack_depth_to_print;

    -int x86_is_stack_id(int id, char *name);
    -
    struct thread_info;
    struct stacktrace_ops;

    diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c
    index d616c06..b1bb8c5 100644
    --- a/arch/x86/kernel/cpu/perf_event.c
    +++ b/arch/x86/kernel/cpu/perf_event.c
    @@ -2297,7 +2297,6 @@ void callchain_store(struct perf_callchain_entry *entry, u64 ip)

    static DEFINE_PER_CPU(struct perf_callchain_entry, pmc_irq_entry);
    static DEFINE_PER_CPU(struct perf_callchain_entry, pmc_nmi_entry);
    -static DEFINE_PER_CPU(int, in_ignored_frame);


    static void
    @@ -2313,10 +2312,6 @@ static void backtrace_warning(void *data, char *msg)

    static int backtrace_stack(void *data, char *name)
    {
    - per_cpu(in_ignored_frame, smp_processor_id()) =
    - x86_is_stack_id(NMI_STACK, name) ||
    - x86_is_stack_id(DEBUG_STACK, name);
    -
    return 0;
    }

    @@ -2324,9 +2319,6 @@ static void backtrace_address(void *data, unsigned long addr, int reliable)
    {
    struct perf_callchain_entry *entry = data;

    - if (per_cpu(in_ignored_frame, smp_processor_id()))
    - return;
    -
    if (reliable)
    callchain_store(entry, addr);
    }
    diff --git a/arch/x86/kernel/dumpstack_32.c b/arch/x86/kernel/dumpstack_32.c
    index ae775ca..11540a1 100644
    --- a/arch/x86/kernel/dumpstack_32.c
    +++ b/arch/x86/kernel/dumpstack_32.c
    @@ -18,11 +18,6 @@

    #include "dumpstack.h"

    -/* Just a stub for now */
    -int x86_is_stack_id(int id, char *name)
    -{
    - return 0;
    -}

    void dump_trace(struct task_struct *task, struct pt_regs *regs,
    unsigned long *stack, unsigned long bp,
    diff --git a/arch/x86/kernel/dumpstack_64.c b/arch/x86/kernel/dumpstack_64.c
    index 0ad9597..676bc05 100644
    --- a/arch/x86/kernel/dumpstack_64.c
    +++ b/arch/x86/kernel/dumpstack_64.c
    @@ -33,11 +33,6 @@ static char x86_stack_ids[][8] = {
    #endif
    };

    -int x86_is_stack_id(int id, char *name)
    -{
    - return x86_stack_ids[id - 1] == name;
    -}
    -
    static unsigned long *in_exception_stack(unsigned cpu, unsigned long stack,
    unsigned *usedp, char **idp)
    {
    --
    1.6.2.3


    \
     
     \ /
      Last update: 2009-12-31 05:55    [W:0.028 / U:0.212 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site