diff options
| author | Tom Rini <trini@ti.com> | 2013-11-25 10:42:53 -0500 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-11-25 10:42:53 -0500 |
| commit | 74279d37613cb3081ee1680d67b2aed1f934472a (patch) | |
| tree | 6528e6a0a08a53856c7d31a7eed28dc4d2ec0d21 /arch/sandbox/cpu/os.c | |
| parent | 1a1326d2da9b2904bc90fb2990f829cb1ecef312 (diff) | |
| parent | ed072b96efd7a5de51cef01c3d4bed4db0e391f0 (diff) | |
Merge branch 'sandbox1' of http://git.denx.de/u-boot-x86
Diffstat (limited to 'arch/sandbox/cpu/os.c')
| -rw-r--r-- | arch/sandbox/cpu/os.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/sandbox/cpu/os.c b/arch/sandbox/cpu/os.c index c2e5f57193..db66fd31f2 100644 --- a/arch/sandbox/cpu/os.c +++ b/arch/sandbox/cpu/os.c @@ -8,6 +8,7 @@ #include <fcntl.h> #include <getopt.h> #include <stdio.h> +#include <stdint.h> #include <stdlib.h> #include <string.h> #include <termios.h> @@ -136,7 +137,7 @@ void os_usleep(unsigned long usec) usleep(usec); } -u64 __attribute__((no_instrument_function)) os_get_nsec(void) +uint64_t __attribute__((no_instrument_function)) os_get_nsec(void) { #if defined(CLOCK_MONOTONIC) && defined(_POSIX_MONOTONIC_CLOCK) struct timespec tp; |