diff options
| author | Russell King | 2014-04-13 21:09:55 +0200 |
|---|---|---|
| committer | Russell King | 2014-05-22 17:27:24 +0200 |
| commit | 7668fd577bae5bba50e97d257a4cf0c44ca002d3 (patch) | |
| tree | 423e92f3c0e9cd09ce0ab0d4caeb47ba839497a4 /arch/arm/include | |
| parent | Linux 3.15-rc6 (diff) | |
| download | kernel-qcow2-linux-7668fd577bae5bba50e97d257a4cf0c44ca002d3.tar.gz kernel-qcow2-linux-7668fd577bae5bba50e97d257a4cf0c44ca002d3.tar.xz kernel-qcow2-linux-7668fd577bae5bba50e97d257a4cf0c44ca002d3.zip | |
ARM: make get_cr()/set_cr() use unsigned long values
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/include')
| -rw-r--r-- | arch/arm/include/asm/cp15.h | 6 |
1 files changed, 3 insertions, 3 deletions
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"); |