Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0fb8ee48 authored by Frederic Weisbecker's avatar Frederic Weisbecker Committed by Ingo Molnar
Browse files

perf: Drop useless check for ignored frame 



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: default avatarFrederic Weisbecker <fweisbec@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Paul Mackerras <paulus@samba.org>
LKML-Reference: <1262235183-5320-2-git-send-regression-fweisbec@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 61405fea

arch/x86/include/asm/stacktrace.h

+0 −2
Original line number Diff line number Diff line
@@ -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;

arch/x86/kernel/cpu/perf_event.c

+0 −8
Original line number Diff line number Diff line
@@ -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);

}

arch/x86/kernel/dumpstack_32.c

+0 −5
Original line number Diff line number Diff line
@@ -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,

arch/x86/kernel/dumpstack_64.c

+0 −5
Original line number Diff line number Diff line
@@ -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)

{