diff options
| author | Akinobu Mita <akinobu.mita@gmail.com> | 2010-02-28 10:58:15 +0000 |
|---|---|---|
| committer | Kyle McMartin <kyle@redhat.com> | 2010-03-06 22:54:59 +0000 |
| commit | 6ee77658ce387ad6c85dcbda4a68bc33efd8de39 (patch) | |
| tree | e830d3aef6080526f03400949ccb86d132f1f817 /arch/parisc | |
| parent | c60185248fd1c7b777f08d3f3337836331da3d17 (diff) | |
| download | linux-stable-6ee77658ce387ad6c85dcbda4a68bc33efd8de39.tar.gz linux-stable-6ee77658ce387ad6c85dcbda4a68bc33efd8de39.tar.bz2 linux-stable-6ee77658ce387ad6c85dcbda4a68bc33efd8de39.zip | |
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/parisc')
| -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 @@ #include <linux/module.h> #include <linux/sched.h> #include <linux/signal.h> +#include <linux/ratelimit.h> #include <asm/uaccess.h> /* #define DEBUG_UNALIGNED 1 */ @@ -446,8 +447,7 @@ static int emulate_std(struct pt_regs *regs, int frreg, int flop) void handle_unaligned(struct pt_regs *regs) { - static unsigned long unaligned_count = 0; - static unsigned long last_time = 0; + static DEFINE_RATELIMIT_STATE(ratelimit, 5 * HZ, 5); unsigned long newbase = R1(regs->iir)?regs->gr[R1(regs->iir)]:0; int modify = 0; int ret = ERR_NOTHANDLED; @@ -460,14 +460,8 @@ void handle_unaligned(struct pt_regs *regs) goto force_sigbus; } - if (unaligned_count > 5 && - time_after(jiffies, last_time + 5 * HZ)) { - unaligned_count = 0; - last_time = jiffies; - } - - if (!(current->thread.flags & PARISC_UAC_NOPRINT) - && ++unaligned_count < 5) { + if (!(current->thread.flags & PARISC_UAC_NOPRINT) && + __ratelimit(&ratelimit)) { char buf[256]; sprintf(buf, "%s(%d): unaligned access to 0x" RFMT " at ip=0x" RFMT "\n", current->comm, task_pid_nr(current), regs->ior, regs->iaoq[0]); |