Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 037f436f525dac36c9f5fd5c5054518a63debb3e

Authored by S.Caglar Onur
Committed by Linus Torvalds
1 parent 95d193a903
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

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: S.Caglar Onur <caglar@pardus.org.tr>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 3 additions and 2 deletions Side-by-side Diff

arch/alpha/kernel/traps.c
Diff comments   View file @ 037f436
... ... @@ -8,6 +8,7 @@
8 8 * This file initializes the trap entry points
9 9 */
10 10  
  11 +#include <linux/jiffies.h>
11 12 #include <linux/mm.h>
12 13 #include <linux/sched.h>
13 14 #include <linux/tty.h>
... ... @@ -770,7 +771,7 @@
770 771 unsigned long reg, struct pt_regs *regs)
771 772 {
772 773 static int cnt = 0;
773   - static long last_time = 0;
  774 + static unsigned long last_time;
774 775  
775 776 unsigned long tmp1, tmp2, tmp3, tmp4;
776 777 unsigned long fake_reg, *reg_addr = &fake_reg;
... ... @@ -781,7 +782,7 @@
781 782 with the unaliged access. */
782 783  
783 784 if (!test_thread_flag (TIF_UAC_NOPRINT)) {
784   - if (cnt >= 5 && jiffies - last_time > 5*HZ) {
  785 + if (cnt >= 5 && time_after(jiffies, last_time + 5 * HZ)) {
785 786 cnt = 0;
786 787 }
787 788 if (++cnt < 5) {