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/traps.c | |
| parent | d590284419b1d7cc2dc646e9bdde4da19061cf0f (diff) | |
| parent | 982792f45894878b9ec13df81e6e02209b34cb11 (diff) | |
| download | lwn-6dec8c15e5faa2a3c02d2e1d1b03b926b545ec0a.tar.gz lwn-6dec8c15e5faa2a3c02d2e1d1b03b926b545ec0a.zip | |
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/traps.c')
| -rw-r--r-- | arch/xtensa/kernel/traps.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/xtensa/kernel/traps.c b/arch/xtensa/kernel/traps.c index f060348c1b23..4a6c495ce9b6 100644 --- a/arch/xtensa/kernel/traps.c +++ b/arch/xtensa/kernel/traps.c @@ -51,6 +51,7 @@ extern void kernel_exception(void); extern void user_exception(void); +extern void fast_illegal_instruction_user(void); extern void fast_syscall_user(void); extern void fast_alloca(void); extern void fast_unaligned(void); @@ -87,6 +88,9 @@ typedef struct { static dispatch_init_table_t __initdata dispatch_init_table[] = { +#ifdef CONFIG_USER_ABI_CALL0_PROBE +{ EXCCAUSE_ILLEGAL_INSTRUCTION, USER, fast_illegal_instruction_user }, +#endif { EXCCAUSE_ILLEGAL_INSTRUCTION, 0, do_illegal_instruction}, { EXCCAUSE_SYSTEM_CALL, USER, fast_syscall_user }, { EXCCAUSE_SYSTEM_CALL, 0, system_call }, |