[PATCH 1/5] arm64: kernel: preparatory: Move config_sctlr_el1

Catalin Marinas catalin.marinas at arm.com
Fri Jul 17 05:59:56 PDT 2015


On Thu, Jul 16, 2015 at 05:01:55PM +0100, James Morse wrote:
> --- a/arch/arm64/kernel/armv8_deprecated.c
> +++ b/arch/arm64/kernel/armv8_deprecated.c
> @@ -16,6 +16,7 @@
>  
>  #include <asm/insn.h>
>  #include <asm/opcodes.h>
> +#include <asm/sysreg.h>
>  #include <asm/system_misc.h>
>  #include <asm/traps.h>
>  #include <asm/uaccess.h>
> @@ -504,16 +505,6 @@ ret:
>  	return 0;
>  }
>  
> -static inline void config_sctlr_el1(u32 clear, u32 set)
> -{
> -	u32 val;
> -
> -	asm volatile("mrs %0, sctlr_el1" : "=r" (val));
> -	val &= ~clear;
> -	val |= set;
> -	asm volatile("msr sctlr_el1, %0" : : "r" (val));
> -}

My ack still stands on this patch but please also move the SCTLR_EL1_*
definitions from asm/cputype.h into asm/sysreg.h (together with this
function).

Thanks.

-- 
Catalin



More information about the linux-arm-kernel mailing list