From 9fb75ea0488d8964b5d1e3bd5d14b43d0b9f9f79 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Mon, 28 Mar 2011 10:54:40 +0200 Subject: [PATCH] --- yaml --- r: 243271 b: refs/heads/master c: 1738209a1500a10fe3cce0b11b81b5bb1c6dffbe h: refs/heads/master i: 243269: f6447c4058f5b49ea2661604ba91b6b5bcf096f7 243267: b4e51f0f7765decfa51f591a377366d81959bbca 243263: 0195967ca7cca4dd36f0f11f831fc75085fc0f93 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-h720x/cpu-h7202.c | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 56d6273a953a..54ac3f2aa9cf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4fe25e3898ec53de322f32b67afa2be872f8ed21 +refs/heads/master: 1738209a1500a10fe3cce0b11b81b5bb1c6dffbe diff --git a/trunk/arch/arm/mach-h720x/cpu-h7202.c b/trunk/arch/arm/mach-h720x/cpu-h7202.c index ac3f91442376..bcf91a517278 100644 --- a/trunk/arch/arm/mach-h720x/cpu-h7202.c +++ b/trunk/arch/arm/mach-h720x/cpu-h7202.c @@ -141,13 +141,18 @@ h7202_timer_interrupt(int irq, void *dev_id) /* * mask multiplexed timer IRQs */ -static void inline mask_timerx_irq(struct irq_data *d) +static void inline __mask_timerx_irq(unsigned int irq) { unsigned int bit; - bit = 2 << ((d->irq == IRQ_TIMER64B) ? 4 : (d->irq - IRQ_TIMER1)); + bit = 2 << ((irq == IRQ_TIMER64B) ? 4 : (irq - IRQ_TIMER1)); CPU_REG (TIMER_VIRT, TIMER_TOPCTRL) &= ~bit; } +static void inline mask_timerx_irq(struct irq_data *d) +{ + __mask_timerx_irq(d->irq); +} + /* * unmask multiplexed timer IRQs */ @@ -196,7 +201,7 @@ void __init h7202_init_irq (void) for (irq = IRQ_TIMER1; irq < IRQ_CHAINED_TIMERX(NR_TIMERX_IRQS); irq++) { - mask_timerx_irq(irq); + __mask_timerx_irq(irq); set_irq_chip(irq, &h7202_timerx_chip); set_irq_handler(irq, handle_edge_irq); set_irq_flags(irq, IRQF_VALID );