diff options
author | Christian Dietrich <christian.dietrich@informatik.uni-erlangen.de> | 2011-06-04 01:36:54 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-06-29 01:31:01 -0400 |
commit | 76462232c21dc011462522387ddad0598a4f11e4 (patch) | |
tree | a21be7280dd159e44f5a9a387c586a059a84485b /arch/powerpc/sysdev | |
parent | 9a8f99fab02db296815d7f0ae8ba8ce169df0063 (diff) |
arch/powerpc: use printk_ratelimited instead of printk_ratelimit
Since printk_ratelimit() shouldn't be used anymore (see comment in
include/linux/printk.h), replace it with printk_ratelimited.
Signed-off-by: Christian Dietrich <christian.dietrich@informatik.uni-erlangen.de>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/sysdev')
-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 3a8de5bb628a..58d7a534f877 100644 --- a/arch/powerpc/sysdev/mpic.c +++ b/arch/powerpc/sysdev/mpic.c | |||
@@ -29,6 +29,7 @@ | |||
29 | #include <linux/pci.h> | 29 | #include <linux/pci.h> |
30 | #include <linux/slab.h> | 30 | #include <linux/slab.h> |
31 | #include <linux/syscore_ops.h> | 31 | #include <linux/syscore_ops.h> |
32 | #include <linux/ratelimit.h> | ||
32 | 33 | ||
33 | #include <asm/ptrace.h> | 34 | #include <asm/ptrace.h> |
34 | #include <asm/signal.h> | 35 | #include <asm/signal.h> |
@@ -1648,9 +1649,8 @@ static unsigned int _mpic_get_one_irq(struct mpic *mpic, int reg) | |||
1648 | return NO_IRQ; | 1649 | return NO_IRQ; |
1649 | } | 1650 | } |
1650 | if (unlikely(mpic->protected && test_bit(src, mpic->protected))) { | 1651 | if (unlikely(mpic->protected && test_bit(src, mpic->protected))) { |
1651 | if (printk_ratelimit()) | 1652 | printk_ratelimited(KERN_WARNING "%s: Got protected source %d !\n", |
1652 | printk(KERN_WARNING "%s: Got protected source %d !\n", | 1653 | mpic->name, (int)src); |
1653 | mpic->name, (int)src); | ||
1654 | mpic_eoi(mpic); | 1654 | mpic_eoi(mpic); |
1655 | return NO_IRQ; | 1655 | return NO_IRQ; |
1656 | } | 1656 | } |
@@ -1688,9 +1688,8 @@ unsigned int mpic_get_coreint_irq(void) | |||
1688 | return NO_IRQ; | 1688 | return NO_IRQ; |
1689 | } | 1689 | } |
1690 | if (unlikely(mpic->protected && test_bit(src, mpic->protected))) { | 1690 | if (unlikely(mpic->protected && test_bit(src, mpic->protected))) { |
1691 | if (printk_ratelimit()) | 1691 | printk_ratelimited(KERN_WARNING "%s: Got protected source %d !\n", |
1692 | printk(KERN_WARNING "%s: Got protected source %d !\n", | 1692 | mpic->name, (int)src); |
1693 | mpic->name, (int)src); | ||
1694 | return NO_IRQ; | 1693 | return NO_IRQ; |
1695 | } | 1694 | } |
1696 | 1695 | ||