From cfc8b00b9f4755b59ddc7ede2f89aa721c15abd5 Mon Sep 17 00:00:00 2001
From: Andi Kleen <ak@suse.de>
Date: Tue, 26 Sep 2006 10:52:34 +0200
Subject: [PATCH] --- yaml --- r: 35874 b: refs/heads/master c:
 950fee84557416a3427dd404a13addc4be7b3e6c h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/arch/i386/kernel/traps.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 5bc87eb870eb..6c7b423b0af1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2b14a78cd07a52001b8c3865ed615d8b9b905b78
+refs/heads/master: 950fee84557416a3427dd404a13addc4be7b3e6c
diff --git a/trunk/arch/i386/kernel/traps.c b/trunk/arch/i386/kernel/traps.c
index 4ced4285163b..86fa7e47f301 100644
--- a/trunk/arch/i386/kernel/traps.c
+++ b/trunk/arch/i386/kernel/traps.c
@@ -197,6 +197,8 @@ void dump_trace(struct task_struct *task, struct pt_regs *regs,
 				if (UNW_SP(&info) >= PAGE_OFFSET) {
 					ops->warning(data, "Leftover inexact backtrace:\n");
 					stack = (void *)UNW_SP(&info);
+					if (!stack)
+						return;
 				} else
 					ops->warning(data, "Full inexact backtrace again:\n");
 			} else if (call_trace >= 1)