diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-09-17 10:21:42 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-09-17 10:21:42 -0500 |
| commit | 509e9c462d03c4b7edc4a0d277311a7f45c9c046 (patch) | |
| tree | f081154c44f3836f25502d654ade6e011ea7125e /linux-user/main.c | |
| parent | cd6dcc710541dd39504f47a5c258f14a762bb767 (diff) | |
| parent | e84d5956cc6215d2f098e7b6090fc5ec4cba1be3 (diff) | |
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
* stefanha/trivial-patches:
configure: fix seccomp check
arch_init.c: add missing '%' symbols before PRIu64 in debug printfs
kvm: Fix warning from static code analysis
qapi: Fix enumeration typo error
console: Clean up bytes per pixel calculation
Fix copy&paste typos in documentation comments
linux-user: Remove #if 0'd cpu_get_real_ticks() definition
ui: Fix spelling in comment (ressource -> resource)
Spelling fixes in comments and macro names (ressource -> resource)
Fix spelling (licenced -> licensed) in GPL
Spelling fixes in comments and documentation
srp: Don't use QEMU_PACKED for single elements of a structured type
Diffstat (limited to 'linux-user/main.c')
| -rw-r--r-- | linux-user/main.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/linux-user/main.c b/linux-user/main.c index 1a1c661ee4..e84a18c33c 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -89,19 +89,6 @@ int cpu_get_pic_interrupt(CPUX86State *env) } #endif -/* timers for rdtsc */ - -#if 0 - -static uint64_t emu_time; - -int64_t cpu_get_real_ticks(void) -{ - return emu_time++; -} - -#endif - #if defined(CONFIG_USE_NPTL) /***********************************************************/ /* Helper routines for implementing atomic operations. */ |