diff options
| author | Tony Luck <tony.luck@intel.com> | 2008-04-17 19:14:51 +0200 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2008-04-17 19:14:51 +0200 |
| commit | 71b264f85ff50c14fe945ffff06ae0d5e9a9124e (patch) | |
| tree | 9fd79c63fd630c4d030a97d254d42a3a73f1328b /arch/ia64/kernel/irq_ia64.c | |
| parent | Pull nptcg into release branch (diff) | |
| parent | [IA64] kdump: Add crash_save_vmcoreinfo for INIT (diff) | |
| download | linux-71b264f85ff50c14fe945ffff06ae0d5e9a9124e.tar.xz linux-71b264f85ff50c14fe945ffff06ae0d5e9a9124e.zip | |
Pull miscellaneous into release branch
Conflicts:
arch/ia64/kernel/mca.c
Diffstat (limited to 'arch/ia64/kernel/irq_ia64.c')
| -rw-r--r-- | arch/ia64/kernel/irq_ia64.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/kernel/irq_ia64.c b/arch/ia64/kernel/irq_ia64.c index d8be23fbe6bc..5538471e8d68 100644 --- a/arch/ia64/kernel/irq_ia64.c +++ b/arch/ia64/kernel/irq_ia64.c @@ -472,7 +472,7 @@ ia64_handle_irq (ia64_vector vector, struct pt_regs *regs) static unsigned char count; static long last_time; - if (jiffies - last_time > 5*HZ) + if (time_after(jiffies, last_time + 5 * HZ)) count = 0; if (++count < 5) { last_time = jiffies; |