Commit 1d16b53e authored by Julia Lawall's avatar Julia Lawall Committed by Ingo Molnar

arch/x86/kernel/io_apic_{64,32}.c: use time_before

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

A simplified version of the semantic patch making this change is as follows:
(http://www.emn.fr/x-info/coccinelle/)

// <smpl>
@ change_compare_np @
expression E;
@@

(
- jiffies <= E
+ time_before_eq(jiffies,E)
|
- jiffies >= E
+ time_after_eq(jiffies,E)
|
- jiffies < E
+ time_before(jiffies,E)
|
- jiffies > E
+ time_after(jiffies,E)
)

@ include depends on change_compare_np @
@@

#include <linux/jiffies.h>

@ no_include depends on !include && change_compare_np @
@@

  #include <linux/...>
+ #include <linux/jiffies.h>
// </smpl>
Signed-off-by: default avatarJulia Lawall <julia@diku.dk>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 4f2479f0
...@@ -35,6 +35,7 @@ ...@@ -35,6 +35,7 @@
#include <linux/htirq.h> #include <linux/htirq.h>
#include <linux/freezer.h> #include <linux/freezer.h>
#include <linux/kthread.h> #include <linux/kthread.h>
#include <linux/jiffies.h> /* time_after() */
#include <asm/io.h> #include <asm/io.h>
#include <asm/smp.h> #include <asm/smp.h>
...@@ -349,7 +350,7 @@ static void set_ioapic_affinity_irq(unsigned int irq, cpumask_t cpumask) ...@@ -349,7 +350,7 @@ static void set_ioapic_affinity_irq(unsigned int irq, cpumask_t cpumask)
# include <asm/processor.h> /* kernel_thread() */ # include <asm/processor.h> /* kernel_thread() */
# include <linux/kernel_stat.h> /* kstat */ # include <linux/kernel_stat.h> /* kstat */
# include <linux/slab.h> /* kmalloc() */ # include <linux/slab.h> /* kmalloc() */
# include <linux/timer.h> /* time_after() */ # include <linux/timer.h>
#define IRQBALANCE_CHECK_ARCH -999 #define IRQBALANCE_CHECK_ARCH -999
#define MAX_BALANCED_IRQ_INTERVAL (5*HZ) #define MAX_BALANCED_IRQ_INTERVAL (5*HZ)
...@@ -1898,7 +1899,7 @@ static int __init timer_irq_works(void) ...@@ -1898,7 +1899,7 @@ static int __init timer_irq_works(void)
* might have cached one ExtINT interrupt. Finally, at * might have cached one ExtINT interrupt. Finally, at
* least one tick may be lost due to delays. * least one tick may be lost due to delays.
*/ */
if (jiffies - t1 > 4) if (time_after(jiffies, t1 + 4))
return 1; return 1;
return 0; return 0;
......
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
#include <linux/msi.h> #include <linux/msi.h>
#include <linux/htirq.h> #include <linux/htirq.h>
#include <linux/dmar.h> #include <linux/dmar.h>
#include <linux/jiffies.h>
#ifdef CONFIG_ACPI #ifdef CONFIG_ACPI
#include <acpi/acpi_bus.h> #include <acpi/acpi_bus.h>
#endif #endif
...@@ -1299,7 +1300,7 @@ static int __init timer_irq_works(void) ...@@ -1299,7 +1300,7 @@ static int __init timer_irq_works(void)
*/ */
/* jiffies wrap? */ /* jiffies wrap? */
if (jiffies - t1 > 4) if (time_after(jiffies, t1 + 4))
return 1; return 1;
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment