xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

um: Pass nsecs to os timer functions

Browse Source 
This makes the code clearer and lets the time travel patch have
the actual time used for these functions in just one place.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Richard Weinberger <richard@nod.at>
This commit is contained in:
Johannes Berg
2019-05-27 10:34:26 +02:00
committed by Richard Weinberger
parent b00bdd3244
commit c7c6f3b953
3 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
arch/um/os-Linux/time.c
View File

@@ -50,18 +50,15 @@ int os_timer_create(void)
return 0;
}
int os_timer_set_interval(void)
int os_timer_set_interval(unsigned long long nsecs)
{
struct itimerspec its;
unsigned long long nsec;
nsec = UM_NSEC_PER_SEC / UM_HZ;
its.it_value.tv_sec = nsecs / UM_NSEC_PER_SEC;
its.it_value.tv_nsec = nsecs % UM_NSEC_PER_SEC;
its.it_value.tv_sec = 0;
its.it_value.tv_nsec = nsec;
its.it_interval.tv_sec = 0;
its.it_interval.tv_nsec = nsec;
its.it_interval.tv_sec = nsecs / UM_NSEC_PER_SEC;
its.it_interval.tv_nsec = nsecs % UM_NSEC_PER_SEC;
if (timer_settime(event_high_res_timer, 0, &its, NULL) == -1)
return -errno;
@@ -69,12 +66,11 @@ int os_timer_set_interval(void)
return 0;
}
int os_timer_one_shot(unsigned long ticks)
int os_timer_one_shot(unsigned long long nsecs)
{
unsigned long long nsec = ticks + 1;
struct itimerspec its = {
.it_value.tv_sec = nsec / UM_NSEC_PER_SEC,
.it_value.tv_nsec = nsec % UM_NSEC_PER_SEC,
.it_value.tv_sec = nsecs / UM_NSEC_PER_SEC,
.it_value.tv_nsec = nsecs % UM_NSEC_PER_SEC,
.it_interval.tv_sec = 0,
.it_interval.tv_nsec = 0, // we cheat here