From d60ca20516b72df57f943fbad6f44eff3ad28c04 Mon Sep 17 00:00:00 2001
From: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Date: Tue, 4 Mar 2008 14:28:32 -0800
Subject: [PATCH] --- yaml --- r: 86783 b: refs/heads/master c:
 10ed273f5016c582413dfbc468dd084957d847e1 h: refs/heads/master i:   86781:
 09cf52ea0f371e16d0c6d016b4f403b3a45a747c   86779:
 ea608679625c4879ad1b7935e171af30a8a4217a   86775:
 168bd03ba3757c70a47b1499b563d437d7a3322a   86767:
 e93041ce3e0b3d412d275ae02758cc67218f918b   86751:
 4ef70f8393409889f5d435fc9625d8eb6c8f0ec3   86719:
 867f307ec82a48db8f4709cd05e72d79482fd122   86655:
 97324de9f155264ee287d908bbb75102ac4001c5   86527:
 88ffd7fa6dae04f7aa7eab83a467f77b3865c589 v: v3

---
 [refs]                | 2 +-
 trunk/mm/page_alloc.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index be45b4eefa3c..77c743738089 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d9d4fcfe515d7cece1b26decd75f5d41544a287b
+refs/heads/master: 10ed273f5016c582413dfbc468dd084957d847e1
diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c
index 8896e874a67d..e76cf94725c9 100644
--- a/trunk/mm/page_alloc.c
+++ b/trunk/mm/page_alloc.c
@@ -19,6 +19,7 @@
 #include <linux/swap.h>
 #include <linux/interrupt.h>
 #include <linux/pagemap.h>
+#include <linux/jiffies.h>
 #include <linux/bootmem.h>
 #include <linux/compiler.h>
 #include <linux/kernel.h>
@@ -1276,7 +1277,7 @@ static nodemask_t *zlc_setup(struct zonelist *zonelist, int alloc_flags)
 	if (!zlc)
 		return NULL;
 
-	if (jiffies - zlc->last_full_zap > 1 * HZ) {
+       if (time_after(jiffies, zlc->last_full_zap + HZ)) {
 		bitmap_zero(zlc->fullzones, MAX_ZONES_PER_ZONELIST);
 		zlc->last_full_zap = jiffies;
 	}