diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2010-08-04 10:53:00 +0200 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2010-08-04 10:53:00 +0200 |
commit | e1b004c3ef9c59db5f013528628b51c8653155ec (patch) | |
tree | 2c60763d361df84131852c3351c7fc0cd754614d | |
parent | af5ab277ded04bd9bc6b048c5a2f0e7d70ef0867 (diff) | |
download | blackbird-op-linux-e1b004c3ef9c59db5f013528628b51c8653155ec.tar.gz blackbird-op-linux-e1b004c3ef9c59db5f013528628b51c8653155ec.zip |
Revert "timer: Added usleep[_range] timer"
This reverts commit 22b8f15c2f7130bb0386f548428df2ffd4e81903 to merge
an advanced version.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r-- | include/linux/delay.h | 6 | ||||
-rw-r--r-- | kernel/timer.c | 22 |
2 files changed, 0 insertions, 28 deletions
diff --git a/include/linux/delay.h b/include/linux/delay.h index 0e303d1aacd8..fd832c6d419e 100644 --- a/include/linux/delay.h +++ b/include/linux/delay.h @@ -45,12 +45,6 @@ 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/kernel/timer.c b/kernel/timer.c index f110f241ab66..ce98685cd1cb 100644 --- a/kernel/timer.c +++ b/kernel/timer.c @@ -1755,25 +1755,3 @@ 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); |