diff options
| author | Dima Zavin <dima@android.com> | 2011-07-07 17:55:44 -0700 |
|---|---|---|
| committer | Dima Zavin <dima@android.com> | 2011-07-07 17:55:44 -0700 |
| commit | 814cdea670616252e4cdf297a07b02ce59698bf1 (patch) | |
| tree | c4a5665995e813c252b07f1e863166059bfb5bcb /arch/powerpc/sysdev/mpic.c | |
| parent | 487ffb052891a552fecf865ad4b24bbe7945a413 (diff) | |
| parent | fe0d42203cb5616eeff68b14576a0f7e2dd56625 (diff) | |
| download | kernel_samsung_espresso10-814cdea670616252e4cdf297a07b02ce59698bf1.zip kernel_samsung_espresso10-814cdea670616252e4cdf297a07b02ce59698bf1.tar.gz kernel_samsung_espresso10-814cdea670616252e4cdf297a07b02ce59698bf1.tar.bz2 | |
Merge commit 'v3.0-rc6' into android-3.0
Diffstat (limited to 'arch/powerpc/sysdev/mpic.c')
| -rw-r--r-- | arch/powerpc/sysdev/mpic.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c index 3a8de5b..58d7a53 100644 --- a/arch/powerpc/sysdev/mpic.c +++ b/arch/powerpc/sysdev/mpic.c @@ -29,6 +29,7 @@ #include <linux/pci.h> #include <linux/slab.h> #include <linux/syscore_ops.h> +#include <linux/ratelimit.h> #include <asm/ptrace.h> #include <asm/signal.h> @@ -1648,9 +1649,8 @@ static unsigned int _mpic_get_one_irq(struct mpic *mpic, int reg) return NO_IRQ; } if (unlikely(mpic->protected && test_bit(src, mpic->protected))) { - if (printk_ratelimit()) - printk(KERN_WARNING "%s: Got protected source %d !\n", - mpic->name, (int)src); + printk_ratelimited(KERN_WARNING "%s: Got protected source %d !\n", + mpic->name, (int)src); mpic_eoi(mpic); return NO_IRQ; } @@ -1688,9 +1688,8 @@ unsigned int mpic_get_coreint_irq(void) return NO_IRQ; } if (unlikely(mpic->protected && test_bit(src, mpic->protected))) { - if (printk_ratelimit()) - printk(KERN_WARNING "%s: Got protected source %d !\n", - mpic->name, (int)src); + printk_ratelimited(KERN_WARNING "%s: Got protected source %d !\n", + mpic->name, (int)src); return NO_IRQ; } |