From 05dcfe53af074a53a7a1d66bdafc042d090acf91 Mon Sep 17 00:00:00 2001
From: Marcelo Feitoza Parisi <marcelo@feitoza.com.br>
Date: Tue, 28 Mar 2006 01:56:45 -0800
Subject: [PATCH] --- yaml --- r: 24491 b: refs/heads/master c:
 05613bdd8647bfc4535b0dcc8f1b95c8b39be394 h: refs/heads/master i:   24489:
 1530986ae9fb94dc61c52b5e37e22cb0760f869e   24487:
 1797dabfe71c0b3abb83c28e80652e6e03d38af0 v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/char/agp/nvidia-agp.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e7bd1475162b..69bbea317a03 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 50297cbf07427b47f0fff5ade8e21cdabf860249
+refs/heads/master: 05613bdd8647bfc4535b0dcc8f1b95c8b39be394
diff --git a/trunk/drivers/char/agp/nvidia-agp.c b/trunk/drivers/char/agp/nvidia-agp.c
index 70b8ed9cd172..4c67135c12d8 100644
--- a/trunk/drivers/char/agp/nvidia-agp.c
+++ b/trunk/drivers/char/agp/nvidia-agp.c
@@ -11,6 +11,7 @@
 #include <linux/gfp.h>
 #include <linux/page-flags.h>
 #include <linux/mm.h>
+#include <linux/jiffies.h>
 #include "agp.h"
 
 /* NVIDIA registers */
@@ -256,7 +257,7 @@ static void nvidia_tlbflush(struct agp_memory *mem)
 		do {
 			pci_read_config_dword(nvidia_private.dev_1,
 					NVIDIA_1_WBC, &wbc_reg);
-			if ((signed)(end - jiffies) <= 0) {
+			if (time_before_eq(end, jiffies)) {
 				printk(KERN_ERR PFX
 				    "TLB flush took more than 3 seconds.\n");
 			}