Patchwork [12/13] hw/arm_gic.c: gic_set_pending_private() is NVIC only

login
register
mail settings
Submitter Peter Maydell
Date April 4, 2012, 3:31 p.m.
Message ID <1333553462-12633-13-git-send-email-peter.maydell@linaro.org>
Download mbox | patch
Permalink /patch/150833/
State New
Headers show

Comments

Peter Maydell - April 4, 2012, 3:31 p.m.
The function gic_set_pending_private() is now used by the NVIC
only (for the GIC we now set PPI interrupts via gpio lines and
gic_set_irq()). So make it #ifdef NVIC and remove the 'attribute
unused' annotation.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 hw/arm_gic.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

Patch

diff --git a/hw/arm_gic.c b/hw/arm_gic.c
index a9da88a..f395e4b 100644
--- a/hw/arm_gic.c
+++ b/hw/arm_gic.c
@@ -185,8 +185,8 @@  static void gic_update(gic_state *s)
     }
 }
 
-static void __attribute__((unused))
-gic_set_pending_private(gic_state *s, int cpu, int irq)
+#ifdef NVIC
+static void gic_set_pending_private(gic_state *s, int cpu, int irq)
 {
     int cm = 1 << cpu;
 
@@ -197,6 +197,7 @@  gic_set_pending_private(gic_state *s, int cpu, int irq)
     GIC_SET_PENDING(irq, cm);
     gic_update(s);
 }
+#endif
 
 /* Process a change in an external IRQ input.  */
 static void gic_set_irq(void *opaque, int irq, int level)