diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-23 14:28:04 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-23 14:28:04 -0400 |
| commit | 9a55d9752d8abfc62f1ab05ccc790d22a0c8e7c0 (patch) | |
| tree | 894bb6a3fb409c6ac5f0374f5a1f656918bc35cd /arch/arm/mach-exynos4 | |
| parent | ec19628d72cff8f80220b7cedba089074ac6a599 (diff) | |
| parent | dc7ad3b3d5f1cd0a0d16c05dd3ad3898979d261e (diff) | |
Merge branch 'devel-stable' into for-linus
Conflicts:
arch/arm/Kconfig
arch/arm/mach-ns9xxx/include/mach/uncompress.h
Diffstat (limited to 'arch/arm/mach-exynos4')
| -rw-r--r-- | arch/arm/mach-exynos4/irq-combiner.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/mach-exynos4/irq-combiner.c b/arch/arm/mach-exynos4/irq-combiner.c index f488b66d6806..5a2758ab055e 100644 --- a/arch/arm/mach-exynos4/irq-combiner.c +++ b/arch/arm/mach-exynos4/irq-combiner.c | |||
| @@ -59,8 +59,7 @@ static void combiner_handle_cascade_irq(unsigned int irq, struct irq_desc *desc) | |||
| 59 | unsigned int cascade_irq, combiner_irq; | 59 | unsigned int cascade_irq, combiner_irq; |
| 60 | unsigned long status; | 60 | unsigned long status; |
| 61 | 61 | ||
| 62 | /* primary controller ack'ing */ | 62 | chained_irq_enter(chip, desc); |
| 63 | chip->irq_ack(&desc->irq_data); | ||
| 64 | 63 | ||
| 65 | spin_lock(&irq_controller_lock); | 64 | spin_lock(&irq_controller_lock); |
| 66 | status = __raw_readl(chip_data->base + COMBINER_INT_STATUS); | 65 | status = __raw_readl(chip_data->base + COMBINER_INT_STATUS); |
| @@ -79,8 +78,7 @@ static void combiner_handle_cascade_irq(unsigned int irq, struct irq_desc *desc) | |||
| 79 | generic_handle_irq(cascade_irq); | 78 | generic_handle_irq(cascade_irq); |
| 80 | 79 | ||
| 81 | out: | 80 | out: |
| 82 | /* primary controller unmasking */ | 81 | chained_irq_exit(chip, desc); |
| 83 | chip->irq_unmask(&desc->irq_data); | ||
| 84 | } | 82 | } |
| 85 | 83 | ||
| 86 | static struct irq_chip combiner_chip = { | 84 | static struct irq_chip combiner_chip = { |