From: Wei Liu <wei.liu2@citrix.com>
Date: Fri, 30 Jun 2017 16:17:44 +0000 (+0100)
Subject: x86/i8259.c: use plain bool
X-Git-Tag: archive/raspbian/4.11.1-1+rpi1~1^2~66^2~1828
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9954f1f72d81f5c145ef72d30ae155c9f3e45109;p=xen.git

x86/i8259.c: use plain bool

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
---

diff --git a/xen/arch/x86/i8259.c b/xen/arch/x86/i8259.c
index 07465aace8..166ca1a3e1 100644
--- a/xen/arch/x86/i8259.c
+++ b/xen/arch/x86/i8259.c
@@ -32,9 +32,9 @@
 
 static DEFINE_SPINLOCK(i8259A_lock);
 
-static bool_t _mask_and_ack_8259A_irq(unsigned int irq);
+static bool _mask_and_ack_8259A_irq(unsigned int irq);
 
-bool_t bogus_8259A_irq(unsigned int irq)
+bool bogus_8259A_irq(unsigned int irq)
 {
     return _mask_and_ack_8259A_irq(irq);
 }
@@ -193,11 +193,11 @@ static inline int i8259A_irq_real(unsigned int irq)
  * to the two 8259s is important!  Return a boolean
  * indicating whether the irq was genuine or spurious.
  */
-static bool_t _mask_and_ack_8259A_irq(unsigned int irq)
+static bool _mask_and_ack_8259A_irq(unsigned int irq)
 {
     unsigned int irqmask = 1 << irq;
     unsigned long flags;
-    bool_t is_real_irq = 1; /* Assume real unless spurious */
+    bool is_real_irq = true; /* Assume real unless spurious */
 
     spin_lock_irqsave(&i8259A_lock, flags);
 
@@ -218,7 +218,7 @@ static bool_t _mask_and_ack_8259A_irq(unsigned int irq)
      */
     if ((cached_irq_mask & irqmask) && !i8259A_irq_real(irq)) {
         static int spurious_irq_mask;
-        is_real_irq = 0;
+        is_real_irq = false;
         /* Report spurious IRQ, once per IRQ line. */
         if (!(spurious_irq_mask & irqmask)) {
             printk("spurious 8259A interrupt: IRQ%d.\n", irq);
diff --git a/xen/include/asm-x86/irq.h b/xen/include/asm-x86/irq.h
index 240c3e8bf2..38edc053f8 100644
--- a/xen/include/asm-x86/irq.h
+++ b/xen/include/asm-x86/irq.h
@@ -108,7 +108,7 @@ void mask_8259A(void);
 void unmask_8259A(void);
 void init_8259A(int aeoi);
 void make_8259A_irq(unsigned int irq);
-bool_t bogus_8259A_irq(unsigned int irq);
+bool bogus_8259A_irq(unsigned int irq);
 int i8259A_suspend(void);
 int i8259A_resume(void);