---

yaml --- r: 86783 b: refs/heads/master c: 10ed273 h: refs/heads/master i: 86781: 09cf52e 86779: ea60867 86775: 168bd03 86767: e93041c 86751: 4ef70f8 86719: 867f307 86655: 97324de 86527: 88ffd7f v: v3
git-mirror · Mar 5, 2008 · d60ca20 · d60ca20
1 parent a8fe3e1
commit d60ca20
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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;
 	}