Commit 5cf1f7ce authored by S.Caglar Onur's avatar S.Caglar Onur Committed by Tony Luck
Browse files

[IA64] arch/ia64/kernel/: use time_* macros 



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

So use the time_after() & time_before() macros, defined at linux/jiffies.h,
which deal with wrapping correctly

[akpm@linux-foundation.org: coding-style fixes]

Signed-off-by: default avatarS.Caglar Onur <caglar@pardus.org.tr>
Reviewed-by: default avatarKOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent 734bc367

arch/ia64/kernel/irq_ia64.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -472,7 +472,7 @@ ia64_handle_irq (ia64_vector vector, struct pt_regs *regs) 
			static unsigned char count;

			static unsigned char count;

			static long last_time;

			static long last_time;





			if (jiffies - last_time > 5*HZ)

			if (time_after(jiffies, last_time + 5 * HZ))

				count = 0;

				count = 0;

			if (++count < 5) {

			if (++count < 5) {

				last_time = jiffies;

				last_time = jiffies;

arch/ia64/kernel/mca.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -69,6 +69,7 @@ 
 * 2007-04-27 Russ Anderson <rja@sgi.com>

 * 2007-04-27 Russ Anderson <rja@sgi.com>

 *	      Support multiple cpus going through OS_MCA in the same event.

 *	      Support multiple cpus going through OS_MCA in the same event.

 */

 */

#include <linux/jiffies.h>

#include <linux/types.h>

#include <linux/types.h>

#include <linux/init.h>

#include <linux/init.h>

#include <linux/sched.h>

#include <linux/sched.h>
@@ -293,7 +294,8 @@ static void ia64_mlogbuf_dump_from_init(void) 
	if (mlogbuf_finished)

	if (mlogbuf_finished)

		return;

		return;





	if (mlogbuf_timestamp && (mlogbuf_timestamp + 30*HZ > jiffies)) {

	if (mlogbuf_timestamp &&

			time_before(jiffies, mlogbuf_timestamp + 30 * HZ)) {

		printk(KERN_ERR "INIT: mlogbuf_dump is interrupted by INIT "

		printk(KERN_ERR "INIT: mlogbuf_dump is interrupted by INIT "

			" and the system seems to be messed up.\n");

			" and the system seems to be messed up.\n");

		ia64_mlogbuf_finish(0);

		ia64_mlogbuf_finish(0);

arch/ia64/kernel/unaligned.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -13,6 +13,7 @@ 
 * 2001/08/13	Correct size of extended floats (float_fsz) from 16 to 10 bytes.

 * 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.

 * 2001/01/17	Add support emulation of unaligned kernel accesses.

 */

 */

#include <linux/jiffies.h>

#include <linux/kernel.h>

#include <linux/kernel.h>

#include <linux/sched.h>

#include <linux/sched.h>

#include <linux/tty.h>

#include <linux/tty.h>
@@ -1290,7 +1291,7 @@ within_logging_rate_limit (void) 
{

{

	static unsigned long count, last_time;

	static unsigned long count, last_time;





	if (jiffies - last_time > 5*HZ)

	if (time_after(jiffies, last_time + 5 * HZ))

		count = 0;

		count = 0;

	if (count < 5) {

	if (count < 5) {

		last_time = jiffies;

		last_time = jiffies;

CRA Git | Maintained and supported by SUSTech CRA and CCSE