Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9ea3a974 authored by Eric W. Biederman's avatar Eric W. Biederman
Browse files

signal/arm64: Consolidate the two hwpoison cases in do_page_fault 



These two cases are practically the same and use siginfo differently
from the other signals sent from do_page_fault.  So consolidate them
to make future changes easier.

Reviewed-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Tested-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
parent f29ad209

arch/arm64/mm/fault.c

+7 −7
Original line number Diff line number Diff line
@@ -577,16 +577,16 @@ static int __kprobes do_page_fault(unsigned long addr, unsigned int esr, 
		 */

		si.si_signo	= SIGBUS;

		si.si_code	= BUS_ADRERR;

	} else if (fault & VM_FAULT_HWPOISON_LARGE) {

		unsigned int hindex = VM_FAULT_GET_HINDEX(fault);

	} else if (fault & (VM_FAULT_HWPOISON_LARGE | VM_FAULT_HWPOISON)) {

		unsigned int lsb;



		lsb = PAGE_SHIFT;

		if (fault & VM_FAULT_HWPOISON_LARGE)

			lsb = hstate_index_to_shift(VM_FAULT_GET_HINDEX(fault));



		si.si_signo	= SIGBUS;

		si.si_code	= BUS_MCEERR_AR;

		si.si_addr_lsb	= hstate_index_to_shift(hindex);

	} else if (fault & VM_FAULT_HWPOISON) {

		si.si_signo	= SIGBUS;

		si.si_code	= BUS_MCEERR_AR;

		si.si_addr_lsb	= PAGE_SHIFT;

		si.si_addr_lsb	= lsb;

	} else {

		/*

		 * Something tried to access memory that isn't in our memory