Commit fcd242c6 authored by Johannes Berg's avatar Johannes Berg Committed by Richard Weinberger
Browse files

um: fix os_timer_one_shot() 



os_timer_one_shot() gets passed a value "unsigned long delta",
so must not have an "int ticks" as that actually ends up being
-1, and thus triggering a timer over and over again.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
parent bebe4681

arch/um/include/shared/os.h

+1 −1
Original line number Diff line number Diff line
@@ -252,7 +252,7 @@ extern void os_warn(const char *fmt, ...) 
extern void os_idle_sleep(unsigned long long nsecs);

extern int os_timer_create(void* timer);

extern int os_timer_set_interval(void* timer, void* its);

extern int os_timer_one_shot(int ticks);

extern int os_timer_one_shot(unsigned long ticks);

extern long long os_timer_disable(void);

extern long os_timer_remain(void* timer);

extern void uml_idle_timer(void);

arch/um/os-Linux/time.c

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ long os_timer_remain(void* timer) 
	return its.it_value.tv_nsec;

}



int os_timer_one_shot(int ticks)

int os_timer_one_shot(unsigned long ticks)

{

	struct itimerspec its;

	unsigned long long nsec;

CRA Git | Maintained and supported by SUSTech CRA and CCSE