From 7ab882c3cbd58caa3761e3a3d2a0b75b6980e120 Mon Sep 17 00:00:00 2001 From: Andi Kleen Date: Tue, 26 Sep 2006 10:52:38 +0200 Subject: [PATCH] --- yaml --- r: 35931 b: refs/heads/master c: e8c7391de4cd91b2cbb0c791f69ba1e066595848 h: refs/heads/master i: 35929: 004ba3a606ac5673cf24e3575a65de36d29807c7 35927: ace42a08bed7055612e515642526ced05e24ab5b v: v3 --- [refs] | 2 +- trunk/arch/x86_64/kernel/traps.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c9a387b0d11e..bae7589fdf99 100644 --- 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 index fb8486eca1b6..01f2a8d254c2 100644 --- 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 \