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

Commit dbfe3828 authored by Anshuman Khandual's avatar Anshuman Khandual Committed by Catalin Marinas
Browse files

arm64/mm: Reorganize arguments for is_el1_permission_fault() 



Most memory abort exception handling related functions have the arguments
in the order (addr, esr, regs) except is_el1_permission_fault(). This
changes the argument order in this function as (addr, esr, regs) like
others.

Acked-by: default avatarMark Rutland <mark.rutland@arm.com>
Signed-off-by: default avatarAnshuman Khandual <anshuman.khandual@arm.com>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent 00bbd5d9

arch/arm64/mm/fault.c

+4 −5
Original line number Diff line number Diff line
@@ -235,9 +235,8 @@ static bool is_el1_instruction_abort(unsigned int esr) 
	return ESR_ELx_EC(esr) == ESR_ELx_EC_IABT_CUR;

}



static inline bool is_el1_permission_fault(unsigned int esr,

					   struct pt_regs *regs,

					   unsigned long addr)

static inline bool is_el1_permission_fault(unsigned long addr, unsigned int esr,

					   struct pt_regs *regs)

{

	unsigned int ec       = ESR_ELx_EC(esr);

	unsigned int fsc_type = esr & ESR_ELx_FSC_TYPE;
@@ -283,7 +282,7 @@ static void __do_kernel_fault(unsigned long addr, unsigned int esr, 
	if (!is_el1_instruction_abort(esr) && fixup_exception(regs))

		return;



	if (is_el1_permission_fault(esr, regs, addr)) {

	if (is_el1_permission_fault(addr, esr, regs)) {

		if (esr & ESR_ELx_WNR)

			msg = "write to read-only memory";

		else
@@ -454,7 +453,7 @@ static int __kprobes do_page_fault(unsigned long addr, unsigned int esr, 
		mm_flags |= FAULT_FLAG_WRITE;

	}



	if (addr < TASK_SIZE && is_el1_permission_fault(esr, regs, addr)) {

	if (addr < TASK_SIZE && is_el1_permission_fault(addr, esr, regs)) {

		/* regs->orig_addr_limit may be 0 if we entered from EL0 */

		if (regs->orig_addr_limit == KERNEL_DS)

			die_kernel_fault("access to user memory with fs=KERNEL_DS",