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/kernel/signal_64.c | |
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/kernel/signal_64.c')
-rw-r--r-- | arch/powerpc/kernel/signal_64.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/arch/powerpc/kernel/signal_64.c b/arch/powerpc/kernel/signal_64.c index da989fff19cc..e91c736cc842 100644 --- a/arch/powerpc/kernel/signal_64.c +++ b/arch/powerpc/kernel/signal_64.c | |||
@@ -24,6 +24,7 @@ | |||
24 | #include <linux/elf.h> | 24 | #include <linux/elf.h> |
25 | #include <linux/ptrace.h> | 25 | #include <linux/ptrace.h> |
26 | #include <linux/module.h> | 26 | #include <linux/module.h> |
27 | #include <linux/ratelimit.h> | ||
27 | 28 | ||
28 | #include <asm/sigcontext.h> | 29 | #include <asm/sigcontext.h> |
29 | #include <asm/ucontext.h> | 30 | #include <asm/ucontext.h> |
@@ -380,10 +381,10 @@ badframe: | |||
380 | printk("badframe in sys_rt_sigreturn, regs=%p uc=%p &uc->uc_mcontext=%p\n", | 381 | printk("badframe in sys_rt_sigreturn, regs=%p uc=%p &uc->uc_mcontext=%p\n", |
381 | regs, uc, &uc->uc_mcontext); | 382 | regs, uc, &uc->uc_mcontext); |
382 | #endif | 383 | #endif |
383 | if (show_unhandled_signals && printk_ratelimit()) | 384 | if (show_unhandled_signals) |
384 | printk(regs->msr & MSR_64BIT ? fmt64 : fmt32, | 385 | printk_ratelimited(regs->msr & MSR_64BIT ? fmt64 : fmt32, |
385 | current->comm, current->pid, "rt_sigreturn", | 386 | current->comm, current->pid, "rt_sigreturn", |
386 | (long)uc, regs->nip, regs->link); | 387 | (long)uc, regs->nip, regs->link); |
387 | 388 | ||
388 | force_sig(SIGSEGV, current); | 389 | force_sig(SIGSEGV, current); |
389 | return 0; | 390 | return 0; |
@@ -468,10 +469,10 @@ badframe: | |||
468 | printk("badframe in setup_rt_frame, regs=%p frame=%p newsp=%lx\n", | 469 | printk("badframe in setup_rt_frame, regs=%p frame=%p newsp=%lx\n", |
469 | regs, frame, newsp); | 470 | regs, frame, newsp); |
470 | #endif | 471 | #endif |
471 | if (show_unhandled_signals && printk_ratelimit()) | 472 | if (show_unhandled_signals) |
472 | printk(regs->msr & MSR_64BIT ? fmt64 : fmt32, | 473 | printk_ratelimited(regs->msr & MSR_64BIT ? fmt64 : fmt32, |
473 | current->comm, current->pid, "setup_rt_frame", | 474 | current->comm, current->pid, "setup_rt_frame", |
474 | (long)frame, regs->nip, regs->link); | 475 | (long)frame, regs->nip, regs->link); |
475 | 476 | ||
476 | force_sigsegv(signr, current); | 477 | force_sigsegv(signr, current); |
477 | return 0; | 478 | return 0; |