diff options
author | Akinobu Mita <akinobu.mita@gmail.com> | 2010-02-28 05:58:15 -0500 |
---|---|---|
committer | Kyle McMartin <kyle@redhat.com> | 2010-03-06 17:54:59 -0500 |
commit | 6ee77658ce387ad6c85dcbda4a68bc33efd8de39 (patch) | |
tree | e830d3aef6080526f03400949ccb86d132f1f817 /arch | |
parent | c60185248fd1c7b777f08d3f3337836331da3d17 (diff) |
parisc: use __ratelimit in unaligned.c
Replace open-coded rate limiting logic with __ratelimit().
Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/parisc/kernel/unaligned.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/arch/parisc/kernel/unaligned.c b/arch/parisc/kernel/unaligned.c index e6f4b7a4b7e3..92d977bb5ea8 100644 --- a/arch/parisc/kernel/unaligned.c +++ b/arch/parisc/kernel/unaligned.c | |||
@@ -25,6 +25,7 @@ | |||
25 | #include <linux/module.h> | 25 | #include <linux/module.h> |
26 | #include <linux/sched.h> | 26 | #include <linux/sched.h> |
27 | #include <linux/signal.h> | 27 | #include <linux/signal.h> |
28 | #include <linux/ratelimit.h> | ||
28 | #include <asm/uaccess.h> | 29 | #include <asm/uaccess.h> |
29 | 30 | ||
30 | /* #define DEBUG_UNALIGNED 1 */ | 31 | /* #define DEBUG_UNALIGNED 1 */ |
@@ -446,8 +447,7 @@ static int emulate_std(struct pt_regs *regs, int frreg, int flop) | |||
446 | 447 | ||
447 | void handle_unaligned(struct pt_regs *regs) | 448 | void handle_unaligned(struct pt_regs *regs) |
448 | { | 449 | { |
449 | static unsigned long unaligned_count = 0; | 450 | static DEFINE_RATELIMIT_STATE(ratelimit, 5 * HZ, 5); |
450 | static unsigned long last_time = 0; | ||
451 | unsigned long newbase = R1(regs->iir)?regs->gr[R1(regs->iir)]:0; | 451 | unsigned long newbase = R1(regs->iir)?regs->gr[R1(regs->iir)]:0; |
452 | int modify = 0; | 452 | int modify = 0; |
453 | int ret = ERR_NOTHANDLED; | 453 | int ret = ERR_NOTHANDLED; |
@@ -460,14 +460,8 @@ void handle_unaligned(struct pt_regs *regs) | |||
460 | goto force_sigbus; | 460 | goto force_sigbus; |
461 | } | 461 | } |
462 | 462 | ||
463 | if (unaligned_count > 5 && | 463 | if (!(current->thread.flags & PARISC_UAC_NOPRINT) && |
464 | time_after(jiffies, last_time + 5 * HZ)) { | 464 | __ratelimit(&ratelimit)) { |
465 | unaligned_count = 0; | ||
466 | last_time = jiffies; | ||
467 | } | ||
468 | |||
469 | if (!(current->thread.flags & PARISC_UAC_NOPRINT) | ||
470 | && ++unaligned_count < 5) { | ||
471 | char buf[256]; | 465 | char buf[256]; |
472 | sprintf(buf, "%s(%d): unaligned access to 0x" RFMT " at ip=0x" RFMT "\n", | 466 | sprintf(buf, "%s(%d): unaligned access to 0x" RFMT " at ip=0x" RFMT "\n", |
473 | current->comm, task_pid_nr(current), regs->ior, regs->iaoq[0]); | 467 | current->comm, task_pid_nr(current), regs->ior, regs->iaoq[0]); |