| Message ID | 1347612146-5407-7-git-send-email-stefanha@gmail.com |
|---|---|
| State | New |
| Headers | show |
On Fri, Sep 14, 2012 at 09:42:20AM +0100, Stefan Hajnoczi wrote: > From: Peter Maydell <peter.maydell@linaro.org> > > Remove the cpu_get_real_ticks() definition from linux-user/main.c. > This has been disabled via #if 0 and unused since commit 1dce7c3c22 > in 2006; the definitions we actually use are in qemu-timer.h. > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> > Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com> Acked-by: Riku Voipio <riku.voipio@linaro.org> > --- > linux-user/main.c | 13 ------------- > 1 file changed, 13 deletions(-) > > diff --git a/linux-user/main.c b/linux-user/main.c > index 1a1c661..e84a18c 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. */ > -- > 1.7.10.4 >
diff --git a/linux-user/main.c b/linux-user/main.c index 1a1c661..e84a18c 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. */