diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-09-17 14:27:30 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-09-17 14:27:30 -0700 |
| commit | 6dec8c15e5faa2a3c02d2e1d1b03b926b545ec0a (patch) | |
| tree | 71d5a41de2c90d4f49b77f5397b2d6bbb18f0d31 /arch/xtensa/kernel/stacktrace.c | |
| parent | d590284419b1d7cc2dc646e9bdde4da19061cf0f (diff) | |
| parent | 982792f45894878b9ec13df81e6e02209b34cb11 (diff) | |
Merge tag 'xtensa-20190917' of git://github.com/jcmvbkbc/linux-xtensa
Pull Xtensa updates from Max Filippov:
- add support for xtensa call0 ABI in userspace
- update xtensa virt board DTS for PCI root complex in KIO range
- remove free_initrd_mem
* tag 'xtensa-20190917' of git://github.com/jcmvbkbc/linux-xtensa:
xtensa: virt: move PCI root complex to KIO range
xtensa: add support for call0 ABI in userspace
xtensa: clean up PS_WOE_BIT usage
xtensa: remove free_initrd_mem
Diffstat (limited to 'arch/xtensa/kernel/stacktrace.c')
| -rw-r--r-- | arch/xtensa/kernel/stacktrace.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/xtensa/kernel/stacktrace.c b/arch/xtensa/kernel/stacktrace.c index b9f82510c650..c822abb93d20 100644 --- a/arch/xtensa/kernel/stacktrace.c +++ b/arch/xtensa/kernel/stacktrace.c @@ -44,6 +44,11 @@ void xtensa_backtrace_user(struct pt_regs *regs, unsigned int depth, if (pc == 0 || pc >= TASK_SIZE || ufn(&frame, data)) return; + if (IS_ENABLED(CONFIG_USER_ABI_CALL0_ONLY) || + (IS_ENABLED(CONFIG_USER_ABI_CALL0_PROBE) && + !(regs->ps & PS_WOE_MASK))) + return; + /* Two steps: * * 1. Look through the register window for the |