diff options
Diffstat (limited to 'arch/arm64/include/asm/cpufeature.h')
-rw-r--r-- | arch/arm64/include/asm/cpufeature.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm64/include/asm/cpufeature.h b/arch/arm64/include/asm/cpufeature.h index 0362f8020d46..07547ccc1f2b 100644 --- a/arch/arm64/include/asm/cpufeature.h +++ b/arch/arm64/include/asm/cpufeature.h | |||
@@ -24,11 +24,11 @@ | |||
24 | #define ARM64_WORKAROUND_CLEAN_CACHE 0 | 24 | #define ARM64_WORKAROUND_CLEAN_CACHE 0 |
25 | #define ARM64_WORKAROUND_DEVICE_LOAD_ACQUIRE 1 | 25 | #define ARM64_WORKAROUND_DEVICE_LOAD_ACQUIRE 1 |
26 | 26 | ||
27 | #define NCAPS 2 | 27 | #define ARM64_NCAPS 2 |
28 | 28 | ||
29 | #ifndef __ASSEMBLY__ | 29 | #ifndef __ASSEMBLY__ |
30 | 30 | ||
31 | extern DECLARE_BITMAP(cpu_hwcaps, NCAPS); | 31 | extern DECLARE_BITMAP(cpu_hwcaps, ARM64_NCAPS); |
32 | 32 | ||
33 | static inline bool cpu_have_feature(unsigned int num) | 33 | static inline bool cpu_have_feature(unsigned int num) |
34 | { | 34 | { |
@@ -37,16 +37,16 @@ static inline bool cpu_have_feature(unsigned int num) | |||
37 | 37 | ||
38 | static inline bool cpus_have_cap(unsigned int num) | 38 | static inline bool cpus_have_cap(unsigned int num) |
39 | { | 39 | { |
40 | if (num >= NCAPS) | 40 | if (num >= ARM64_NCAPS) |
41 | return false; | 41 | return false; |
42 | return test_bit(num, cpu_hwcaps); | 42 | return test_bit(num, cpu_hwcaps); |
43 | } | 43 | } |
44 | 44 | ||
45 | static inline void cpus_set_cap(unsigned int num) | 45 | static inline void cpus_set_cap(unsigned int num) |
46 | { | 46 | { |
47 | if (num >= NCAPS) | 47 | if (num >= ARM64_NCAPS) |
48 | pr_warn("Attempt to set an illegal CPU capability (%d >= %d)\n", | 48 | pr_warn("Attempt to set an illegal CPU capability (%d >= %d)\n", |
49 | num, NCAPS); | 49 | num, ARM64_NCAPS); |
50 | else | 50 | else |
51 | __set_bit(num, cpu_hwcaps); | 51 | __set_bit(num, cpu_hwcaps); |
52 | } | 52 | } |