diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-04-13 15:09:55 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-05-22 11:27:24 -0400 |
commit | 7668fd577bae5bba50e97d257a4cf0c44ca002d3 (patch) | |
tree | 423e92f3c0e9cd09ce0ab0d4caeb47ba839497a4 /arch/arm/include | |
parent | 4b660a7f5c8099d88d1a43d8ae138965112592c7 (diff) |
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 @@ | |||
52 | extern unsigned long cr_no_alignment; /* defined in entry-armv.S */ | 52 | extern unsigned long cr_no_alignment; /* defined in entry-armv.S */ |
53 | extern unsigned long cr_alignment; /* defined in entry-armv.S */ | 53 | extern unsigned long cr_alignment; /* defined in entry-armv.S */ |
54 | 54 | ||
55 | static inline unsigned int get_cr(void) | 55 | static inline unsigned long get_cr(void) |
56 | { | 56 | { |
57 | unsigned int val; | 57 | unsigned long val; |
58 | asm("mrc p15, 0, %0, c1, c0, 0 @ get CR" : "=r" (val) : : "cc"); | 58 | asm("mrc p15, 0, %0, c1, c0, 0 @ get CR" : "=r" (val) : : "cc"); |
59 | return val; | 59 | return val; |
60 | } | 60 | } |
61 | 61 | ||
62 | static inline void set_cr(unsigned int val) | 62 | static inline void set_cr(unsigned long val) |
63 | { | 63 | { |
64 | asm volatile("mcr p15, 0, %0, c1, c0, 0 @ set CR" | 64 | asm volatile("mcr p15, 0, %0, c1, c0, 0 @ set CR" |
65 | : : "r" (val) : "cc"); | 65 | : : "r" (val) : "cc"); |