lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[S390] fix dump_stack vs. %p and (null)

Browse Source 
The s390 implemenation of dump_stack uses %p to display stack content.
Since d97106ab53 (Make %p print '(null)'
for NULL pointers) this causes a strange output for dump_stack:

[...]
Process basename (pid: 8822, task: 00000000b2ece038, ksp: 00000000b24d7b38)
04000000b5685c00 00000000b24d7760 0000000000000002 (null)
00000000b24d7800 00000000b24d7778 00000000b24d7778 00000000001052fe
(null) 00000000b24d7b38 (null) 000000000000000a
000000000000000d (null) 00000000b24d7760 00000000b24d77d8
000000000051a7e8 00000000001052fe 00000000b24d7760 00000000b24d77b0
Call Trace:
[...]

This patch changes our dump_stack to use the appropriate %x format.

Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
This commit is contained in:
Christian Borntraeger
2009-03-26 15:23:42 +01:00
committed by Martin Schwidefsky
parent 8e0ee43bc2
commit d7fd5f1e3b
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/s390/kernel/traps.c
View File

@@ -61,9 +61,11 @@ extern pgm_check_handler_t do_asce_exception;
#define stack_pointer ({ void **sp; asm("la %0,0(15)" : "=&d" (sp)); sp; }) #define stack_pointer ({ void **sp; asm("la %0,0(15)" : "=&d" (sp)); sp; })
#ifndef CONFIG_64BIT #ifndef CONFIG_64BIT
#define LONG "%08lx "
#define FOURLONG "%08lx %08lx %08lx %08lx\n" #define FOURLONG "%08lx %08lx %08lx %08lx\n"
static int kstack_depth_to_print = 12; static int kstack_depth_to_print = 12;
#else /* CONFIG_64BIT */ #else /* CONFIG_64BIT */
#define LONG "%016lx "
#define FOURLONG "%016lx %016lx %016lx %016lx\n" #define FOURLONG "%016lx %016lx %016lx %016lx\n"
static int kstack_depth_to_print = 20; static int kstack_depth_to_print = 20;
#endif /* CONFIG_64BIT */ #endif /* CONFIG_64BIT */
@@ -155,7 +157,7 @@ void show_stack(struct task_struct *task, unsigned long *sp)
break; break;
if (i && ((i * sizeof (long) % 32) == 0)) if (i && ((i * sizeof (long) % 32) == 0))
printk("\n "); printk("\n ");
printk("%p ", (void *)*stack++); printk(LONG, *stack++);
} }
printk("\n"); printk("\n");
show_trace(task, sp); show_trace(task, sp);