From 7010e7c88c76961be4cf9f4c96a0c669365e320e Mon Sep 17 00:00:00 2001
From: Patrick Pannuto <ppannuto@codeaurora.org>
Date: Mon, 19 Jul 2010 15:09:26 -0700
Subject: [PATCH] --- yaml --- r: 206135 b: refs/heads/master c:
 22b8f15c2f7130bb0386f548428df2ffd4e81903 h: refs/heads/master i:   206133:
 ea598a0461a3121da7fd71e30d14beaf1e7c6641   206131:
 a265fa9c70046167d2b4bcceb7f399833f9b71e2   206127:
 e73253545bee7dac5d721b5facb2796cec8a34fc v: v3

---
 [refs]                      |  2 +-
 trunk/include/linux/delay.h |  6 ++++++
 trunk/kernel/timer.c        | 22 ++++++++++++++++++++++
 3 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index c35a12c27e6c..67e5250b786d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 866e26115cba6b59cec669b6307599e3e4440491
+refs/heads/master: 22b8f15c2f7130bb0386f548428df2ffd4e81903
diff --git a/trunk/include/linux/delay.h b/trunk/include/linux/delay.h
index fd832c6d419e..0e303d1aacd8 100644
--- a/trunk/include/linux/delay.h
+++ b/trunk/include/linux/delay.h
@@ -45,6 +45,12 @@ extern unsigned long lpj_fine;
 void calibrate_delay(void);
 void msleep(unsigned int msecs);
 unsigned long msleep_interruptible(unsigned int msecs);
+void usleep_range(unsigned long min, unsigned long max);
+
+static inline void usleep(unsigned long usecs)
+{
+	usleep_range(usecs, usecs);
+}
 
 static inline void ssleep(unsigned int seconds)
 {
diff --git a/trunk/kernel/timer.c b/trunk/kernel/timer.c
index ce98685cd1cb..f110f241ab66 100644
--- a/trunk/kernel/timer.c
+++ b/trunk/kernel/timer.c
@@ -1755,3 +1755,25 @@ unsigned long msleep_interruptible(unsigned int msecs)
 }
 
 EXPORT_SYMBOL(msleep_interruptible);
+
+static int __sched do_usleep_range(unsigned long min, unsigned long max)
+{
+	ktime_t kmin;
+	unsigned long delta;
+
+	kmin = ktime_set(0, min * NSEC_PER_USEC);
+	delta = max - min;
+	return schedule_hrtimeout_range(&kmin, delta, HRTIMER_MODE_REL);
+}
+
+/**
+ * usleep_range - Drop in replacement for udelay where wakeup is flexible
+ * @min: Minimum time in usecs to sleep
+ * @max: Maximum time in usecs to sleep
+ */
+void usleep_range(unsigned long min, unsigned long max)
+{
+	__set_current_state(TASK_UNINTERRUPTIBLE);
+	do_usleep_range(min, max);
+}
+EXPORT_SYMBOL(usleep_range);