From: Russell King Date: Sun, 13 Apr 2014 19:09:55 +0000 (+0100) Subject: ARM: make get_cr()/set_cr() use unsigned long values X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=7668fd577bae5bba50e97d257a4cf0c44ca002d3;p=linux-beck.git ARM: make get_cr()/set_cr() use unsigned long values Signed-off-by: Russell King --- diff --git a/arch/arm/include/asm/cp15.h b/arch/arm/include/asm/cp15.h index 6493802f880a..d5bf322a0630 100644 --- a/arch/arm/include/asm/cp15.h +++ b/arch/arm/include/asm/cp15.h @@ -52,14 +52,14 @@ extern unsigned long cr_no_alignment; /* defined in entry-armv.S */ extern unsigned long cr_alignment; /* defined in entry-armv.S */ -static inline unsigned int get_cr(void) +static inline unsigned long get_cr(void) { - unsigned int val; + unsigned long val; asm("mrc p15, 0, %0, c1, c0, 0 @ get CR" : "=r" (val) : : "cc"); return val; } -static inline void set_cr(unsigned int val) +static inline void set_cr(unsigned long val) { asm volatile("mcr p15, 0, %0, c1, c0, 0 @ set CR" : : "r" (val) : "cc");