From patchwork Mon Aug 20 13:03:36 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 10803 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 75E7B23F70 for ; Mon, 20 Aug 2012 13:03:44 +0000 (UTC) Received: from mail-gg0-f180.google.com (mail-gg0-f180.google.com [209.85.161.180]) by fiordland.canonical.com (Postfix) with ESMTP id 0CFBCA1885C for ; Mon, 20 Aug 2012 13:03:37 +0000 (UTC) Received: by mail-gg0-f180.google.com with SMTP id i2so5251298ggm.11 for ; Mon, 20 Aug 2012 06:03:43 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:x-gm-message-state; bh=e5LMslYxy7usB3wm5C6WW6iSnyi7zz43dnKduS+A9as=; b=GuFdNO5C79BcyEYD+wuXzaJnxAQzEw6OvddnKKLkTu3szfhymLbTbGgvnFrrHfUaiY pyUM7eJXsFwwQM75mBr+OdqsTLnyTXaGEDnAd+mBcDuGwtsyCQr6OtyTq6BEXaAr1mIw Xv35/elEVOMeUOg5BB0qRzV9KZK8TltNXBhdTqrCrEi0j83bX+syRa/2jF3VqH5m3g4e IYe1oSIc485LCBxO1amfJK2ImcuFgmN2OvPZIKZ+jwm5CKAmEMEXyia/0+2JAV5/W9R/ sr5mC4URNwn96yKPLTiTOLfzgLV0y3a/rQ/U0lGqz3yt7GH0wPqcF/YkgLlHUBEJP++P S/Aw== Received: by 10.50.45.162 with SMTP id o2mr9785999igm.0.1345467823100; Mon, 20 Aug 2012 06:03:43 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.184.232 with SMTP id ex8csp82813igc; Mon, 20 Aug 2012 06:03:42 -0700 (PDT) Received: by 10.14.179.200 with SMTP id h48mr8688189eem.12.1345467821753; Mon, 20 Aug 2012 06:03:41 -0700 (PDT) Received: from mnementh.archaic.org.uk (1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.d.1.0.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:1d0::1]) by mx.google.com with ESMTPS id a1si10803341eep.52.2012.08.20.06.03.40 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 20 Aug 2012 06:03:41 -0700 (PDT) Received-SPF: neutral (google.com: 2001:8b0:1d0::1 is neither permitted nor denied by best guess record for domain of pm215@archaic.org.uk) client-ip=2001:8b0:1d0::1; Authentication-Results: mx.google.com; spf=neutral (google.com: 2001:8b0:1d0::1 is neither permitted nor denied by best guess record for domain of pm215@archaic.org.uk) smtp.mail=pm215@archaic.org.uk Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1T3Rdo-0002q8-QG; Mon, 20 Aug 2012 14:03:36 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: Riku Voipio , qemu-trivial@nongnu.org, patches@linaro.org Subject: [PATCH] linux-user: Remove #if 0'd cpu_get_real_ticks() definition Date: Mon, 20 Aug 2012 14:03:36 +0100 Message-Id: <1345467816-10893-1-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 X-Gm-Message-State: ALoCoQkVZM7WbfO3xY0EiL7Ozp1sgK70pdOfFyUter2znMz3TVw3iVgB8OCrsJulPeHvIAlvrqYQ 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 --- linux-user/main.c | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/linux-user/main.c b/linux-user/main.c index 7dea084..0659ae8 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. */