Commit dea20281 authored by Russell King (Oracle)'s avatar Russell King (Oracle)
Browse files

ARM: group is_permission_fault() with is_translation_fault() 



Group is_permission_fault() with is_translation_fault(), which is
needed to use is_permission_fault() in __do_kernel_fault(). As
this is static inline, there is no need for this to be under
CONFIG_MMU.

Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
parent edb924a7

arch/arm/mm/fault.c

+13 −13
Original line number Diff line number Diff line
@@ -128,6 +128,19 @@ static inline bool is_translation_fault(unsigned int fsr) 
	return false;

}



static inline bool is_permission_fault(unsigned int fsr)

{

	int fs = fsr_fs(fsr);

#ifdef CONFIG_ARM_LPAE

	if ((fs & FS_MMU_NOLL_MASK) == FS_PERM_NOLL)

		return true;

#else

	if (fs == FS_L1_PERM || fs == FS_L2_PERM)

		return true;

#endif

	return false;

}



static void die_kernel_fault(const char *msg, struct mm_struct *mm,

			     unsigned long addr, unsigned int fsr,

			     struct pt_regs *regs)
@@ -225,19 +238,6 @@ void do_bad_area(unsigned long addr, unsigned int fsr, struct pt_regs *regs) 
}



#ifdef CONFIG_MMU

static inline bool is_permission_fault(unsigned int fsr)

{

	int fs = fsr_fs(fsr);

#ifdef CONFIG_ARM_LPAE

	if ((fs & FS_MMU_NOLL_MASK) == FS_PERM_NOLL)

		return true;

#else

	if (fs == FS_L1_PERM || fs == FS_L2_PERM)

		return true;

#endif

	return false;

}



#ifdef CONFIG_CPU_TTBR0_PAN

static inline bool ttbr0_usermode_access_allowed(struct pt_regs *regs)

{