Commit fac07790 authored May 10, 2007 by Andrew Morton Committed by Russell King May 11, 2007

[ARM] stacktrace fix



ab1b6f03 said

 - remove the unused task argument to save_stack_trace, it's always current

then broke arm:

arch/arm/kernel/stacktrace.c:56: error: conflicting types for 'save_stack_trace'
include/linux/stacktrace.h:11: error: previous declaration of 'save_stack_trace' was here
arch/arm/kernel/stacktrace.c:56: error: conflicting types for 'save_stack_trace'
include/linux/stacktrace.h:11: error: previous declaration of 'save_stack_trace' was here

Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

parent 030f4810

arch/arm/kernel/stacktrace.c

+3 −9

Original line number	Diff line number	Diff line
		@@ -52,21 +52,15 @@ static int save_trace(struct stackframe frame, void d)
		return trace->nr_entries >= trace->max_entries;
		}

		void save_stack_trace(struct stack_trace trace, struct task_struct task)
		void save_stack_trace(struct stack_trace *trace)
		{
		struct stack_trace_data data;
		unsigned long fp, base;

		data.trace = trace;
		data.skip = trace->skip;

		if (task) {
		base = (unsigned long)task_stack_page(task);
		fp = 0; /* FIXME */
		} else {
		base = (unsigned long)task_stack_page(current);
		asm("mov %0, fp" : "=r" (fp));
		}

		walk_stackframe(fp, base, base + THREAD_SIZE, save_trace, &data);
		}