From 986e64faa88d05b5f3164b7f39e07cc506db23e6 Mon Sep 17 00:00:00 2001
From: Richard Weinberger <richard@nod.at>
Date: Tue, 26 Oct 2010 14:21:13 -0700
Subject: [PATCH] --- yaml --- r: 217426 b: refs/heads/master c:
 482db6df1746c4fa7d64a2441d4cb2610249c679 h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/arch/um/os-Linux/time.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 1540bc155832..f4e2c5c5d8bc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b7f50cfa3630b6e079929ffccfd442d65064ee1f
+refs/heads/master: 482db6df1746c4fa7d64a2441d4cb2610249c679
diff --git a/trunk/arch/um/os-Linux/time.c b/trunk/arch/um/os-Linux/time.c
index dec5678fc17f..6e3359d6a839 100644
--- a/trunk/arch/um/os-Linux/time.c
+++ b/trunk/arch/um/os-Linux/time.c
@@ -60,7 +60,7 @@ static inline long long timeval_to_ns(const struct timeval *tv)
 long long disable_timer(void)
 {
 	struct itimerval time = ((struct itimerval) { { 0, 0 }, { 0, 0 } });
-	int remain, max = UM_NSEC_PER_SEC / UM_HZ;
+	long long remain, max = UM_NSEC_PER_SEC / UM_HZ;
 
 	if (setitimer(ITIMER_VIRTUAL, &time, &time) < 0)
 		printk(UM_KERN_ERR "disable_timer - setitimer failed, "