Commit 4f2479f0 authored Jan 30, 2008 by Julia Lawall Committed by Ingo Molnar Jan 30, 2008

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: Julia Lawall <julia@diku.dk>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

parent e5fc3161

arch/x86/kernel/apm_32.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -227,6 +227,7 @@
		#include <linux/dmi.h>
		#include <linux/suspend.h>
		#include <linux/kthread.h>
		#include <linux/jiffies.h>

		#include <asm/system.h>
		#include <asm/uaccess.h>
		@@ -1287,7 +1288,7 @@ static void check_events(void)
		"event 0x%02x\n", event);
		}
		if (ignore_bounce
		&& ((jiffies - last_resume) > bounce_interval))
		&& (time_after(jiffies, last_resume + bounce_interval)))
		ignore_bounce = 0;

		switch (event) {

Admin message