diff options
Diffstat (limited to 'arch/um/include')
| -rw-r--r-- | arch/um/include/os.h | 12 | ||||
| -rw-r--r-- | arch/um/include/time_user.h | 19 |
2 files changed, 11 insertions, 20 deletions
diff --git a/arch/um/include/os.h b/arch/um/include/os.h index 7f27dfe0eca..624938ad9e1 100644 --- a/arch/um/include/os.h +++ b/arch/um/include/os.h @@ -190,7 +190,6 @@ extern int os_protect_memory(void *addr, unsigned long len, int r, int w, int x); extern int os_unmap_memory(void *addr, int len); extern void os_flush_stdout(void); -extern unsigned long long os_usecs(void); /* tt.c * for tt mode only (will be deleted in future...) @@ -245,4 +244,15 @@ extern void setup_machinename(char *machine_out); extern void setup_hostinfo(void); extern int setjmp_wrapper(void (*proc)(void *, void *), ...); +/* time.c */ +#define BILLION (1000 * 1000 * 1000) + +extern void switch_timers(int to_real); +extern void idle_sleep(int secs); +extern void enable_timer(void); +extern void disable_timer(void); +extern void user_time_init(void); +extern void uml_idle_timer(void); +extern unsigned long long os_nsecs(void); + #endif diff --git a/arch/um/include/time_user.h b/arch/um/include/time_user.h deleted file mode 100644 index 17d7ef2141f..00000000000 --- a/arch/um/include/time_user.h +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2002 Jeff Dike (jdike@karaya.com) - * Licensed under the GPL - */ - -#ifndef __TIME_USER_H__ -#define __TIME_USER_H__ - -extern void timer(void); -extern void switch_timers(int to_real); -extern void idle_sleep(int secs); -extern void enable_timer(void); -extern void prepare_timer(void * ptr); -extern void disable_timer(void); -extern unsigned long time_lock(void); -extern void time_unlock(unsigned long); -extern void user_time_init(void); - -#endif |