arm/cpu{errata,feature}.[ch]: switch to plain bool

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: Julien Grall <julien.grall@arm.com>

diff --git a/xen/arch/arm/cpuerrata.c b/xen/arch/arm/cpuerrata.c
index f89c0abe7e5e900a4eb348e94ed9aee0ba03326b..fe9e9facbe64aedcd076b2b4f220df3d35c33e17 100644 (file)
--- a/xen/arch/arm/cpuerrata.c
+++ b/xen/arch/arm/cpuerrata.c
@@ -7,7 +7,7 @@
     .midr_range_min = min,              \
     .midr_range_max = max
 
-static bool_t __maybe_unused
+static bool __maybe_unused
 is_affected_midr_range(const struct arm_cpu_capabilities *entry)
 {
     return MIDR_IS_CPU_MODEL_RANGE(boot_cpu_data.midr.bits, entry->midr_model,

diff --git a/xen/include/asm-arm/cpuerrata.h b/xen/include/asm-arm/cpuerrata.h
index 7b504418da45291c7f576092a432f122568219b9..8b158429c7881854fecdc5b6bf88ab6c902bd3c1 100644 (file)
--- a/xen/include/asm-arm/cpuerrata.h
+++ b/xen/include/asm-arm/cpuerrata.h
@@ -9,13 +9,13 @@ void check_local_cpu_errata(void);
 #ifdef CONFIG_HAS_ALTERNATIVE
 
 #define CHECK_WORKAROUND_HELPER(erratum, feature, arch)         \
-static inline bool_t check_workaround_##erratum(void)           \
+static inline bool check_workaround_##erratum(void)             \
 {                                                               \
     if ( !IS_ENABLED(arch) )                                    \
-        return 0;                                               \
+        return false;                                           \
     else                                                        \
     {                                                           \
-        bool_t ret;                                             \
+        bool ret;                                               \
                                                                 \
         asm volatile (ALTERNATIVE("mov %0, #0",                 \
                                   "mov %0, #1",                 \
@@ -29,10 +29,10 @@ static inline bool_t check_workaround_##erratum(void)           \
 #else /* CONFIG_HAS_ALTERNATIVE */
 
 #define CHECK_WORKAROUND_HELPER(erratum, feature, arch)         \
-static inline bool_t check_workaround_##erratum(void)           \
+static inline bool check_workaround_##erratum(void)             \
 {                                                               \
     if ( !IS_ENABLED(arch) )                                    \
-        return 0;                                               \
+        return false;                                           \
     else                                                        \
         return unlikely(cpus_have_cap(feature));                \
 }

diff --git a/xen/include/asm-arm/cpufeature.h b/xen/include/asm-arm/cpufeature.h
index b3cf706332dc2d38d0dc97fa4997caec521fcbe6..f00b6dbd39e01e0e5c4ed0782e6c96e7ae523df8 100644 (file)
--- a/xen/include/asm-arm/cpufeature.h
+++ b/xen/include/asm-arm/cpufeature.h
@@ -53,10 +53,10 @@
 
 extern DECLARE_BITMAP(cpu_hwcaps, ARM_NCAPS);
 
-static inline bool_t cpus_have_cap(unsigned int num)
+static inline bool cpus_have_cap(unsigned int num)
 {
     if ( num >= ARM_NCAPS )
-        return 0;
+        return false;
 
     return test_bit(num, cpu_hwcaps);
 }
@@ -73,7 +73,7 @@ static inline void cpus_set_cap(unsigned int num)
 struct arm_cpu_capabilities {
     const char *desc;
     u16 capability;
-    bool_t (*matches)(const struct arm_cpu_capabilities *);
+    bool (*matches)(const struct arm_cpu_capabilities *);
     union {
         struct {    /* To be used for eratum handling only */
             u32 midr_model;