Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=fac0779029749dfe8d77a35c26606ebda7a8e176
Commit: fac0779029749dfe8d77a35c26606ebda7a8e176
Parent: 030f4810e782e541468d36c27e721b582b7820a4
Author: Andrew Morton <[EMAIL PROTECTED]>
AuthorDate: Thu May 10 22:33:05 2007 -0700
Committer: Russell King <[EMAIL PROTECTED]>
CommitDate: Fri May 11 17:38:50 2007 +0100
[ARM] stacktrace fix
ab1b6f03a10ba1f5638188ab06bf46e33ac3a160 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 <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Russell King <[EMAIL PROTECTED]>
---
arch/arm/kernel/stacktrace.c | 12 +++---------
1 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/arch/arm/kernel/stacktrace.c b/arch/arm/kernel/stacktrace.c
index 77ef35e..398d0c0 100644
--- a/arch/arm/kernel/stacktrace.c
+++ b/arch/arm/kernel/stacktrace.c
@@ -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));
- }
+ base = (unsigned long)task_stack_page(current);
+ asm("mov %0, fp" : "=r" (fp));
walk_stackframe(fp, base, base + THREAD_SIZE, save_trace, &data);
}
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
