diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-02-17 08:34:10 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-02-17 08:34:10 -0800 |
commit | 0513ebc33ed6b590bfbaaf21cd7b3d571c20edb9 (patch) | |
tree | 73d5f4ab008efb27a4c0df21dc6347e466bab314 /arch/csky/kernel/dumpstack.c | |
parent | 1653c2f2da0153f386b3b7494dc077631ae982c8 (diff) | |
parent | 131aee8b9807bc98379fa5a0270389dbc7dcec90 (diff) | |
download | linux-0513ebc33ed6b590bfbaaf21cd7b3d571c20edb9.tar.bz2 |
Merge tag 'csky-for-linus-5.0-rc6' of git://github.com/c-sky/csky-linux
Pull arch/csky fixes from Guo Ren:
"Here are some fixup patches for 5.0-rc6"
* tag 'csky-for-linus-5.0-rc6' of git://github.com/c-sky/csky-linux:
csky: Fixup dead loop in show_stack
csky: Fixup io-range page attribute for mmap("/dev/mem")
csky: coding convention: Use task_stack_page
csky: Fixup wrong pt_regs size
csky: Fixup _PAGE_GLOBAL bit for 610 tlb entry
Diffstat (limited to 'arch/csky/kernel/dumpstack.c')
-rw-r--r-- | arch/csky/kernel/dumpstack.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/csky/kernel/dumpstack.c b/arch/csky/kernel/dumpstack.c index 659253e9989c..d67f9777cfd9 100644 --- a/arch/csky/kernel/dumpstack.c +++ b/arch/csky/kernel/dumpstack.c @@ -38,7 +38,11 @@ void show_stack(struct task_struct *task, unsigned long *stack) if (task) stack = (unsigned long *)thread_saved_fp(task); else +#ifdef CONFIG_STACKTRACE + asm volatile("mov %0, r8\n":"=r"(stack)::"memory"); +#else stack = (unsigned long *)&stack; +#endif } show_trace(stack); |