From: Heiko Carstens Date: Thu, 12 Oct 2023 07:40:45 +0000 (+0200) Subject: s390/mm,fault: remove VM_FAULT_PFAULT X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=cca12b427d43bb57be207d634e1d44e9792d1cb4;p=linux.git s390/mm,fault: remove VM_FAULT_PFAULT Handling of VM_FAULT_PFAULT and VM_FAULT_BADCONTEXT is nearly identical; the only difference is within do_no_context() where however the fault_type (KERNEL_FAULT vs GMAP_FAULT) makes sure that both types will be handled differently. Therefore it is possible to get rid of VM_FAULT_PFAULT and use VM_FAULT_BADCONTEXT instead. Reviewed-by: Claudio Imbrenda Signed-off-by: Heiko Carstens Signed-off-by: Vasily Gorbik --- diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c index c37e28fbfbef3..ee8a409175920 100644 --- a/arch/s390/mm/fault.c +++ b/arch/s390/mm/fault.c @@ -53,7 +53,6 @@ #define VM_FAULT_BADMAP ((__force vm_fault_t)0x40000000) #define VM_FAULT_BADACCESS ((__force vm_fault_t)0x20000000) #define VM_FAULT_SIGNAL ((__force vm_fault_t)0x10000000) -#define VM_FAULT_PFAULT ((__force vm_fault_t)0x8000000) enum fault_type { KERNEL_FAULT, @@ -294,7 +293,6 @@ static void do_fault_error(struct pt_regs *regs, vm_fault_t fault) } fallthrough; case VM_FAULT_BADCONTEXT: - case VM_FAULT_PFAULT: do_no_context(regs, fault); break; case VM_FAULT_SIGNAL: @@ -459,7 +457,7 @@ retry: * mmap_lock has not been released */ current->thread.gmap_pfault = 1; - fault = VM_FAULT_PFAULT; + fault = VM_FAULT_BADCONTEXT; goto out_up; } flags &= ~FAULT_FLAG_RETRY_NOWAIT;