diff options
| author | Steve French <sfrench@us.ibm.com> | 2011-01-31 04:17:03 +0000 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2011-01-31 04:17:03 +0000 |
| commit | 58b8a5b45a097b477c037bc376e65dc5f214bf3d (patch) | |
| tree | 9fa2538a113fbd3aaa322d9c972aca3ca16b7e30 /arch/x86/kernel/dumpstack_64.c | |
| parent | ffeb414a59291d5891f09727beb793c109f19f08 (diff) | |
| parent | 70d1f365568e0cdbc9f4ab92428e1830fdb09ab0 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/x86/kernel/dumpstack_64.c')
| -rw-r--r-- | arch/x86/kernel/dumpstack_64.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/dumpstack_64.c b/arch/x86/kernel/dumpstack_64.c index 64101335de19..a6b6fcf7f0ae 100644 --- a/arch/x86/kernel/dumpstack_64.c +++ b/arch/x86/kernel/dumpstack_64.c @@ -149,13 +149,13 @@ void dump_trace(struct task_struct *task, unsigned used = 0; struct thread_info *tinfo; int graph = 0; + unsigned long dummy; unsigned long bp; if (!task) task = current; if (!stack) { - unsigned long dummy; stack = &dummy; if (task && task != current) stack = (unsigned long *)task->thread.sp; |