---

yaml --- r: 257084 b: refs/heads/master c: 47ce11a h: refs/heads/master v: v3
git-mirror · Jul 2, 2011 · fb83ad5 · fb83ad5
1 parent 38260c1
commit fb83ad5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9e46294dadedc0c04adcb8ce760bd2cd74f7332d
+refs/heads/master: 47ce11a2b6519f9c7843223ea8e561eb71ea5896
diff --git a/trunk/arch/x86/kernel/dumpstack_64.c b/trunk/arch/x86/kernel/dumpstack_64.c
@@ -155,9 +155,12 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
 		task = current;
 
 	if (!stack) {
-		stack = &dummy;
-		if (task && task != current)
+		if (regs)
+			stack = (unsigned long *)regs->sp;
+		else if (task && task != current)
 			stack = (unsigned long *)task->thread.sp;
+		else
+			stack = &dummy;
 	}
 
 	if (!bp)