projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-headers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[linux-2.6-block.git]
/
arch
/
x86
/
kernel
/
dumpstack_32.c
diff --git
a/arch/x86/kernel/dumpstack_32.c
b/arch/x86/kernel/dumpstack_32.c
index 6942297e5b3d853c962c2c690eb5de89293b2cd8..09675712eba807a8470962c53102ad1e7dc32afa 100644
(file)
--- a/
arch/x86/kernel/dumpstack_32.c
+++ b/
arch/x86/kernel/dumpstack_32.c
@@
-96,7
+96,9
@@
show_stack_log_lvl(struct task_struct *task, struct pt_regs *regs,
int i;
if (sp == NULL) {
- if (task)
+ if (regs)
+ sp = (unsigned long *)regs->sp;
+ else if (task)
sp = (unsigned long *)task->thread.sp;
else
sp = (unsigned long *)&sp;