diff options
author | David Brownell <david-b@pacbell.net> | 2008-02-26 11:10:50 -0800 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2008-03-05 10:23:19 +0200 |
commit | 8ba55c5c139f9be26b87d3aab9998f54d8d3057a (patch) | |
tree | 305c108c17900332bcffe78b34c1b618680ab12e | |
parent | b8488fbe6d2f32ff4ad2f8f348a50e42389fc727 (diff) | |
download | talos-op-linux-8ba55c5c139f9be26b87d3aab9998f54d8d3057a.tar.gz talos-op-linux-8ba55c5c139f9be26b87d3aab9998f54d8d3057a.zip |
ARM: OMAP: fix false lockdep warnings
Remove false lockdep warnings about lock recursion when declaring
IRQs as being wake-capable, by marking putting GPIO irq_desc locks
into their own class.
(Thanks to Peter Zijlstra for helping track down such a small
fix to this problem.)
Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>
-rw-r--r-- | arch/arm/plat-omap/gpio.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/plat-omap/gpio.c b/arch/arm/plat-omap/gpio.c index 56f4d1394d56..9030495509f8 100644 --- a/arch/arm/plat-omap/gpio.c +++ b/arch/arm/plat-omap/gpio.c @@ -1277,6 +1277,11 @@ static struct clk *gpio_fclks[OMAP34XX_NR_GPIOS]; static struct clk *gpio_iclks[OMAP34XX_NR_GPIOS]; #endif +/* This lock class tells lockdep that GPIO irqs are in a different + * category than their parents, so it won't report false recursion. + */ +static struct lock_class_key gpio_lock_class; + static int __init _omap_gpio_init(void) { int i; @@ -1450,6 +1455,7 @@ static int __init _omap_gpio_init(void) #endif for (j = bank->virtual_irq_start; j < bank->virtual_irq_start + gpio_count; j++) { + lockdep_set_class(&irq_desc[j].lock, &gpio_lock_class); set_irq_chip_data(j, bank); if (bank_is_mpuio(bank)) set_irq_chip(j, &mpuio_irq_chip); |