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

Commit 037f436f authored by S.Çağlar Onur's avatar S.Çağlar Onur Committed by Linus Torvalds
Browse files

arch/alpha/kernel/traps.c: use time_* macros 



The functions time_before, time_before_eq, time_after, and time_after_eq are
more robust for comparing jiffies against other values.

So implement usage of the time_after() macro, defined in linux/jiffies.h,
which deals with wrapping correctly

[akpm@linux-foundation.org: fix warning]
Signed-off-by: default avatarS.Caglar Onur <caglar@pardus.org.tr>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 95d193a9

arch/alpha/kernel/traps.c

+3 −2
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
 * This file initializes the trap entry points

 */



#include <linux/jiffies.h>

#include <linux/mm.h>

#include <linux/sched.h>

#include <linux/tty.h>
@@ -770,7 +771,7 @@ do_entUnaUser(void __user * va, unsigned long opcode, 
	      unsigned long reg, struct pt_regs *regs)

{

	static int cnt = 0;

	static long last_time = 0;

	static unsigned long last_time;



	unsigned long tmp1, tmp2, tmp3, tmp4;

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



	if (!test_thread_flag (TIF_UAC_NOPRINT)) {

		if (cnt >= 5 && jiffies - last_time > 5*HZ) {

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

			cnt = 0;

		}

		if (++cnt < 5) {