Commit 4f2479f0 authored by Julia Lawall's avatar Julia Lawall Committed by Ingo Molnar

arch/x86/kernel/apm_32.c: use time_before, time_before_eq,

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 e5fc3161
...@@ -227,6 +227,7 @@ ...@@ -227,6 +227,7 @@
#include <linux/dmi.h> #include <linux/dmi.h>
#include <linux/suspend.h> #include <linux/suspend.h>
#include <linux/kthread.h> #include <linux/kthread.h>
#include <linux/jiffies.h>
#include <asm/system.h> #include <asm/system.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
...@@ -1287,7 +1288,7 @@ static void check_events(void) ...@@ -1287,7 +1288,7 @@ static void check_events(void)
"event 0x%02x\n", event); "event 0x%02x\n", event);
} }
if (ignore_bounce if (ignore_bounce
&& ((jiffies - last_resume) > bounce_interval)) && (time_after(jiffies, last_resume + bounce_interval)))
ignore_bounce = 0; ignore_bounce = 0;
switch (event) { switch (event) {
......
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