shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-04-14 17:40:41 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "rk29: add hr_msleep/hr_msleep_interruptible/usleep"

Browse Source 
This reverts commit c4c6281fd7.
This commit is contained in:
黄涛
2011-07-22 16:40:22 +08:00
parent c4c6281fd7
commit 5675bfaadd
2 changed files with 0 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/linux/delay.h
View File

@@ -52,13 +52,4 @@ static inline void ssleep(unsigned int seconds)
msleep(seconds * 1000);
}
#ifdef CONFIG_ARCH_RK29
void hr_msleep(unsigned int msecs);
unsigned long hr_msleep_interruptible(unsigned int msecs);
static inline void usleep(unsigned long usecs)
{
usleep_range(usecs, usecs);
}
#endif /* CONFIG_ARCH_RK29 */
#endif /* defined(_LINUX_DELAY_H) */

59
kernel/timer.c
View File

@@ -1712,62 +1712,3 @@ void usleep_range(unsigned long min, unsigned long max)
do_usleep_range(min, max);
}
EXPORT_SYMBOL(usleep_range);
#ifdef CONFIG_ARCH_RK29
static void do_nsleep(unsigned int nsecs, struct hrtimer_sleeper *sleeper,
int sigs)
{
enum hrtimer_mode mode = HRTIMER_MODE_REL;
int state = sigs ? TASK_INTERRUPTIBLE : TASK_UNINTERRUPTIBLE;
/*
* This is really just a reworked and simplified version
* of do_nanosleep().
*/
hrtimer_init(&sleeper->timer, CLOCK_MONOTONIC, mode);
sleeper->timer._expires = ktime_set(0, nsecs);
hrtimer_init_sleeper(sleeper, current);
do {
set_current_state(state);
hrtimer_start(&sleeper->timer, sleeper->timer._expires, mode);
if (sleeper->task)
schedule();
hrtimer_cancel(&sleeper->timer);
mode = HRTIMER_MODE_ABS;
} while (sleeper->task && !(sigs && signal_pending(current)));
}
/**
* msleep - sleep safely even with waitqueue interruptions
* @msecs: Time in milliseconds to sleep for
*/
void hr_msleep(unsigned int msecs)
{
struct hrtimer_sleeper sleeper;
do_nsleep(msecs * NSEC_PER_MSEC, &sleeper, 0);
}
EXPORT_SYMBOL(hr_msleep);
/**
* msleep_interruptible - sleep waiting for signals
* @msecs: Time in milliseconds to sleep for
*/
unsigned long hr_msleep_interruptible(unsigned int msecs)
{
struct hrtimer_sleeper sleeper;
ktime_t left;
do_nsleep(msecs * NSEC_PER_MSEC, &sleeper, 1);
if (!sleeper.task)
return 0;
left = ktime_sub(sleeper.timer._expires,
sleeper.timer.base->get_time());
return max(((long) ktime_to_ns(left))/(long)NSEC_PER_MSEC, 1L);
}
EXPORT_SYMBOL(hr_msleep_interruptible);
#endif /* CONFIG_ARCH_RK29 */