android/android_kernel_asus_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

posix-timers: Convert clock_getres() to clockid_to_kclock()

Browse Source 
Use the new kclock decoding. Fixup the fallout in mmtimer.c

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: John Stultz <johnstul@us.ibm.com>
Tested-by: Richard Cochran <richard.cochran@omicron.at>
LKML-Reference: <20110201134418.709802797@linutronix.de>
This commit is contained in:
Thomas Gleixner 2011-02-01 13:51:53 +00:00
parent 4359ac0ace
commit e5e542eea9
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/char/mmtimer.c
View File

@ -53,6 +53,8 @@ MODULE_LICENSE("GPL");
#define RTC_BITS 55 /* 55 bits for this implementation */ #define RTC_BITS 55 /* 55 bits for this implementation */
static struct k_clock sgi_clock;
extern unsigned long sn_rtc_cycles_per_second; extern unsigned long sn_rtc_cycles_per_second;
#define RTC_COUNTER_ADDR ((long *)LOCAL_MMR_ADDR(SH_RTC)) #define RTC_COUNTER_ADDR ((long *)LOCAL_MMR_ADDR(SH_RTC))
@ -763,10 +765,18 @@ static int sgi_timer_set(struct k_itimer *timr, int flags,
return err; return err;
} }
static int sgi_clock_getres(const clockid_t which_clock, struct timespec *tp)
{
tp->tv_sec = 0;
tp->tv_nsec = sgi_clock.res;
return 0;
}
static struct k_clock sgi_clock = { static struct k_clock sgi_clock = {
.res = 0, .res = 0,
.clock_set = sgi_clock_set, .clock_set = sgi_clock_set,
.clock_get = sgi_clock_get, .clock_get = sgi_clock_get,
.clock_getres = sgi_clock_getres,
.timer_create = sgi_timer_create, .timer_create = sgi_timer_create,
.timer_set = sgi_timer_set, .timer_set = sgi_timer_set,
.timer_del = sgi_timer_del, .timer_del = sgi_timer_del,

17
kernel/posix-timers.c
View File

@ -182,14 +182,6 @@ static inline void unlock_timer(struct k_itimer *timr, unsigned long flags)
* the function pointer CALL in struct k_clock. * the function pointer CALL in struct k_clock.
*/ */
static inline int common_clock_getres(const clockid_t which_clock,
struct timespec *tp)
{
tp->tv_sec = 0;
tp->tv_nsec = posix_clocks[which_clock].res;
return 0;
}
static int common_timer_create(struct k_itimer *new_timer) static int common_timer_create(struct k_itimer *new_timer)
{ {
hrtimer_init(&new_timer->it.real.timer, new_timer->it_clock, 0); hrtimer_init(&new_timer->it.real.timer, new_timer->it_clock, 0);
@ -984,18 +976,17 @@ SYSCALL_DEFINE2(clock_gettime, const clockid_t, which_clock,
SYSCALL_DEFINE2(clock_getres, const clockid_t, which_clock, SYSCALL_DEFINE2(clock_getres, const clockid_t, which_clock,
struct timespec __user *, tp) struct timespec __user *, tp)
{ {
struct k_clock *kc = clockid_to_kclock(which_clock);
struct timespec rtn_tp; struct timespec rtn_tp;
int error; int error;
if (invalid_clockid(which_clock)) if (!kc)
return -EINVAL; return -EINVAL;
error = CLOCK_DISPATCH(which_clock, clock_getres, error = kc->clock_getres(which_clock, &rtn_tp);
(which_clock, &rtn_tp));
if (!error && tp && copy_to_user(tp, &rtn_tp, sizeof (rtn_tp))) { if (!error && tp && copy_to_user(tp, &rtn_tp, sizeof (rtn_tp)))
error = -EFAULT; error = -EFAULT;
}
return error; return error;
} }