From: Wei Liu <wei.liu2@citrix.com>
Date: Fri, 15 Sep 2017 09:06:55 +0000 (+0100)
Subject: arm/alternative.c: switch to plain bool
X-Git-Tag: archive/raspbian/4.11.1-1+rpi1~1^2~66^2~1407
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ef948de9dc5d535a972c382a0b988c836e10a759;p=xen.git

arm/alternative.c: switch to plain bool

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

diff --git a/xen/arch/arm/alternative.c b/xen/arch/arm/alternative.c
index a3bcda3117..9ffdc475d6 100644
--- a/xen/arch/arm/alternative.c
+++ b/xen/arch/arm/alternative.c
@@ -46,17 +46,17 @@ struct alt_region {
 /*
  * Check if the target PC is within an alternative block.
  */
-static bool_t branch_insn_requires_update(const struct alt_instr *alt,
-                                          unsigned long pc)
+static bool branch_insn_requires_update(const struct alt_instr *alt,
+                                        unsigned long pc)
 {
     unsigned long replptr;
 
     if ( is_active_kernel_text(pc) )
-        return 1;
+        return true;
 
     replptr = (unsigned long)ALT_REPL_PTR(alt);
     if ( pc >= replptr && pc <= (replptr + alt->alt_len) )
-        return 0;
+        return false;
 
     /*
      * Branching into *another* alternate sequence is doomed, and