From 161c0bf514703ae9b721ca29f8f98f484ad9511f Mon Sep 17 00:00:00 2001
From: Julia Lawall <julia@diku.dk>
Date: Thu, 17 Apr 2008 09:28:25 -0400
Subject: [PATCH] --- yaml --- r: 93247 b: refs/heads/master c:
 b39b04403bba4f807ee6e57ae2f4407187588fcd h: refs/heads/master i:   93245:
 e0401c8cceb2f852a1a675b664fd70229b7800a7   93243:
 b0090bab8d8612077d983fd76709b60442d24c43   93239:
 5ad2e2f545421236cdca3a5e76082ba2550187b4   93231:
 5d20d679460afb11cddfc5499d95b6b6dc2ca69f   93215:
 4fb34a4558efa6489ebec2570d1cebd08fb7d24b   93183:
 d5d762b38cf41fdcfd2545b89476b494da45c3a1 v: v3

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

diff --git a/[refs] b/[refs]
index 1af94d9bd4fb..1a68dc43c6e5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 81e329cdddd63d66e2b3c3dc51d429ba074cdbb8
+refs/heads/master: b39b04403bba4f807ee6e57ae2f4407187588fcd
diff --git a/trunk/drivers/char/keyboard.c b/trunk/drivers/char/keyboard.c
index 59608e341385..45806d27579a 100644
--- a/trunk/drivers/char/keyboard.c
+++ b/trunk/drivers/char/keyboard.c
@@ -42,6 +42,7 @@
 #include <linux/input.h>
 #include <linux/reboot.h>
 #include <linux/notifier.h>
+#include <linux/jiffies.h>
 
 extern void ctrl_alt_del(void);
 
@@ -928,7 +929,8 @@ static void k_brl(struct vc_data *vc, unsigned char value, char up_flag)
 	if (up_flag) {
 		if (brl_timeout) {
 			if (!committing ||
-			    jiffies - releasestart > (brl_timeout * HZ) / 1000) {
+			    time_after(jiffies,
+				       releasestart + msecs_to_jiffies(brl_timeout))) {
 				committing = pressed;
 				releasestart = jiffies;
 			}