---

yaml --- r: 35931 b: refs/heads/master c: e8c7391 h: refs/heads/master i: 35929: 004ba3a 35927: ace42a0 v: v3
git-mirror · Sep 26, 2006 · 7ab882c · 7ab882c
1 parent 2e5f437
commit 7ab882c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3566561bfadffcb5dbc85d576be80c0dbf2cccc9
+refs/heads/master: e8c7391de4cd91b2cbb0c791f69ba1e066595848
diff --git a/trunk/arch/x86_64/kernel/traps.c b/trunk/arch/x86_64/kernel/traps.c
@@ -299,7 +299,9 @@ void dump_trace(struct task_struct *tsk, struct pt_regs *regs, unsigned long * s
 #define HANDLE_STACK(cond) \
 	do while (cond) { \
 		unsigned long addr = *stack++; \
-		if (kernel_text_address(addr)) { \
+		if (oops_in_progress ? 		\
+			__kernel_text_address(addr) : \
+			kernel_text_address(addr)) { \
 			/* \
 			 * If the address is either in the text segment of the \
 			 * kernel, or in the region which contains vmalloc'ed \