diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2022-01-10 09:49:13 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2022-01-10 09:49:13 +0100 |
| commit | 8a2094d679d921d104d3296528d4fa419702ce1c (patch) | |
| tree | 5feeb2f8b94eb3632109b778276ccd1007486770 /arch/openrisc/mm/fault.c | |
| parent | 3809fe479861194e310c23ed48b010c7c0f72d22 (diff) | |
| parent | b60d3c803d7603432a08aeaf988aff53b3a5ec64 (diff) | |
Merge branch 'for-5.17/core' into for-linus
- support for USI style pens (Tero Kristo, Mika Westerberg)
- quirk for devices that need inverted X/Y axes (Alistair Francis)
- small core code cleanups and deduplication (Benjamin Tissoires)
Diffstat (limited to 'arch/openrisc/mm/fault.c')
| -rw-r--r-- | arch/openrisc/mm/fault.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/openrisc/mm/fault.c b/arch/openrisc/mm/fault.c index c730d1a51686..f0fa6394a58e 100644 --- a/arch/openrisc/mm/fault.c +++ b/arch/openrisc/mm/fault.c @@ -32,7 +32,7 @@ unsigned long pte_errors; /* updated by do_page_fault() */ */ volatile pgd_t *current_pgd[NR_CPUS]; -extern void die(char *, struct pt_regs *, long); +extern void __noreturn die(char *, struct pt_regs *, long); /* * This routine handles page faults. It determines the address, @@ -248,8 +248,6 @@ no_context: die("Oops", regs, write_acc); - do_exit(SIGKILL); - /* * We ran out of memory, or some other thing happened to us that made * us unable to handle the page fault gracefully. |