Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2a238a96 authored by Akinobu Mita's avatar Akinobu Mita Committed by Matt Turner
Browse files

alpha: use __ratelimit 



Replace open-coded rate limiting logic with __ratelimit().

Signed-off-by: default avatarAkinobu Mita <akinobu.mita@gmail.com>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: linux-alpha@vger.kernel.org
Signed-off-by: default avatarMatt Turner <mattst88@gmail.com>
parent 39710479

arch/alpha/kernel/traps.c

+3 −7
Original line number Original line Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <linux/module.h>

#include <linux/module.h>

#include <linux/init.h>

#include <linux/init.h>

#include <linux/kallsyms.h>

#include <linux/kallsyms.h>

#include <linux/ratelimit.h>





#include <asm/gentrap.h>

#include <asm/gentrap.h>

#include <asm/uaccess.h>

#include <asm/uaccess.h>
@@ -771,8 +772,7 @@ asmlinkage void 
do_entUnaUser(void __user * va, unsigned long opcode,

do_entUnaUser(void __user * va, unsigned long opcode,

	      unsigned long reg, struct pt_regs *regs)

	      unsigned long reg, struct pt_regs *regs)

{

{

	static int cnt = 0;

	static DEFINE_RATELIMIT_STATE(ratelimit, 5 * HZ, 5);

	static unsigned long last_time;





	unsigned long tmp1, tmp2, tmp3, tmp4;

	unsigned long tmp1, tmp2, tmp3, tmp4;

	unsigned long fake_reg, *reg_addr = &fake_reg;

	unsigned long fake_reg, *reg_addr = &fake_reg;
@@ -783,15 +783,11 @@ do_entUnaUser(void __user * va, unsigned long opcode, 
	   with the unaliged access.  */

	   with the unaliged access.  */





	if (!test_thread_flag (TIF_UAC_NOPRINT)) {

	if (!test_thread_flag (TIF_UAC_NOPRINT)) {

		if (cnt >= 5 && time_after(jiffies, last_time + 5 * HZ)) {

		if (__ratelimit(&ratelimit)) {

			cnt = 0;

		}

		if (++cnt < 5) {

			printk("%s(%d): unaligned trap at %016lx: %p %lx %ld\n",

			printk("%s(%d): unaligned trap at %016lx: %p %lx %ld\n",

			       current->comm, task_pid_nr(current),

			       current->comm, task_pid_nr(current),

			       regs->pc - 4, va, opcode, reg);

			       regs->pc - 4, va, opcode, reg);

		}

		}

		last_time = jiffies;

	}

	}

	if (test_thread_flag (TIF_UAC_SIGBUS))

	if (test_thread_flag (TIF_UAC_SIGBUS))

		goto give_sigbus;

		goto give_sigbus;