Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6-omap-h63xx.git] / arch / parisc / kernel / unaligned.c

diff --git a/arch/parisc/kernel/unaligned.c b/arch/parisc/kernel/unaligned.c
index 9f5f01e9d8f3e50690f539157e5d83e5da6d75a6..e6f4b7a4b7e321eaefbd03dc5b2766f55f73d887 100644 (file)
--- a/arch/parisc/kernel/unaligned.c
+++ b/arch/parisc/kernel/unaligned.c
@@ -460,7 +460,8 @@ void handle_unaligned(struct pt_regs *regs)
                        goto force_sigbus;
                }
 
-               if (unaligned_count > 5 && jiffies - last_time > 5*HZ) {
+               if (unaligned_count > 5 &&
+                               time_after(jiffies, last_time + 5 * HZ)) {
                        unaligned_count = 0;
                        last_time = jiffies;
                }