diff options
| author | Tony Luck <tony.luck@intel.com> | 2008-04-17 10:14:51 -0700 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2008-04-17 10:14:51 -0700 |
| commit | 71b264f85ff50c14fe945ffff06ae0d5e9a9124e (patch) | |
| tree | 9fd79c63fd630c4d030a97d254d42a3a73f1328b /arch/ia64/kernel/unaligned.c | |
| parent | f4df39cbdd9e9ab615e80148cc271db22a8508ad (diff) | |
| parent | 072f042df335d7e0da2027637bcf720d7ff1589b (diff) | |
Pull miscellaneous into release branch
Conflicts:
arch/ia64/kernel/mca.c
Diffstat (limited to 'arch/ia64/kernel/unaligned.c')
| -rw-r--r-- | arch/ia64/kernel/unaligned.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/ia64/kernel/unaligned.c b/arch/ia64/kernel/unaligned.c index 6903361d11a5..ff0e7c10faa7 100644 --- a/arch/ia64/kernel/unaligned.c +++ b/arch/ia64/kernel/unaligned.c @@ -13,6 +13,7 @@ * 2001/08/13 Correct size of extended floats (float_fsz) from 16 to 10 bytes. * 2001/01/17 Add support emulation of unaligned kernel accesses. */ +#include <linux/jiffies.h> #include <linux/kernel.h> #include <linux/sched.h> #include <linux/tty.h> @@ -1290,7 +1291,7 @@ within_logging_rate_limit (void) { static unsigned long count, last_time; - if (jiffies - last_time > 5*HZ) + if (time_after(jiffies, last_time + 5 * HZ)) count = 0; if (count < 5) { last_time = jiffies; |