diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2007-05-12 16:12:12 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-05-12 16:12:12 +0100 |
| commit | 158304ef09a28c7f2dd37d78f536a4e09ba084a1 (patch) | |
| tree | 2e6d808fef46d70268e547ccfc5926a865e3d2ea /arch/arm/kernel | |
| parent | 641e79129a56a4c50be1aed0fa713f440b46a440 (diff) | |
| parent | 25f4a81ef51b7c279786f5b81fe6d89510f46d99 (diff) | |
| download | op-kernel-dev-158304ef09a28c7f2dd37d78f536a4e09ba084a1.zip op-kernel-dev-158304ef09a28c7f2dd37d78f536a4e09ba084a1.tar.gz | |
Merge branch 'fixes' into devel
Diffstat (limited to 'arch/arm/kernel')
| -rw-r--r-- | arch/arm/kernel/armksyms.c | 1 | ||||
| -rw-r--r-- | arch/arm/kernel/stacktrace.c | 12 |
2 files changed, 4 insertions, 9 deletions
diff --git a/arch/arm/kernel/armksyms.c b/arch/arm/kernel/armksyms.c index 4779f47..9179e82 100644 --- a/arch/arm/kernel/armksyms.c +++ b/arch/arm/kernel/armksyms.c @@ -76,6 +76,7 @@ EXPORT_SYMBOL(__const_udelay); /* networking */ EXPORT_SYMBOL(csum_partial); +EXPORT_SYMBOL(csum_partial_copy_from_user); EXPORT_SYMBOL(csum_partial_copy_nocheck); EXPORT_SYMBOL(__csum_ipv6_magic); 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); } |
