diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-05 19:26:21 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-05 19:26:21 +0000 |
| commit | bd5a8444da4bfd877d849fc84349dbe8b5d8e8c3 (patch) | |
| tree | 960f32220de8775b6d51cbb8ba880c81aa24b095 /arch/s390 | |
| parent | Releasing progress-linux version 6.9.11-1~progress7.99u1. (diff) | |
| download | linux-bd5a8444da4bfd877d849fc84349dbe8b5d8e8c3.tar.xz linux-bd5a8444da4bfd877d849fc84349dbe8b5d8e8c3.zip | |
Merging upstream version 6.9.12.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/mm/fault.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c index 0c66b32e0f..063a6ea378 100644 --- a/arch/s390/mm/fault.c +++ b/arch/s390/mm/fault.c @@ -432,12 +432,13 @@ error: handle_fault_error_nolock(regs, 0); else do_sigsegv(regs, SEGV_MAPERR); - } else if (fault & VM_FAULT_SIGBUS) { + } else if (fault & (VM_FAULT_SIGBUS | VM_FAULT_HWPOISON)) { if (!user_mode(regs)) handle_fault_error_nolock(regs, 0); else do_sigbus(regs); } else { + pr_emerg("Unexpected fault flags: %08x\n", fault); BUG(); } } |