From patchwork Tue Jun 22 12:56:00 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jes Sorensen X-Patchwork-Id: 107382 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o5MCuKBX018619 for ; Tue, 22 Jun 2010 12:56:20 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755655Ab0FVM4S (ORCPT ); Tue, 22 Jun 2010 08:56:18 -0400 Received: from mx1.redhat.com ([209.132.183.28]:6412 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755792Ab0FVM4R (ORCPT ); Tue, 22 Jun 2010 08:56:17 -0400 Received: from int-mx08.intmail.prod.int.phx2.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o5MCuGYs030339 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 22 Jun 2010 08:56:16 -0400 Received: from localhost.localdomain (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by int-mx08.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o5MCu6tb002896; Tue, 22 Jun 2010 08:56:14 -0400 From: Jes.Sorensen@redhat.com To: avi@redhat.com Cc: qemu-devel@nongnu.org, kvm@vger.kernel.org, Jes Sorensen Subject: [PATCH 3/7] time_drift_fix is x86 only, rather than !ia64 Date: Tue, 22 Jun 2010 14:56:00 +0200 Message-Id: <1277211364-12451-4-git-send-email-Jes.Sorensen@redhat.com> In-Reply-To: <1277211364-12451-1-git-send-email-Jes.Sorensen@redhat.com> References: <1277211364-12451-1-git-send-email-Jes.Sorensen@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.21 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Tue, 22 Jun 2010 12:56:20 +0000 (UTC) diff --git a/hw/i8259.c b/hw/i8259.c index a8ae069..e89d831 100644 --- a/hw/i8259.c +++ b/hw/i8259.c @@ -237,7 +237,7 @@ int pic_read_irq(PicState2 *s) if (irq >= 0) { pic_intack(&s->pics[0], irq); -#ifndef TARGET_IA64 +#ifdef TARGET_I386 if (time_drift_fix && irq == 0) { extern int64_t timer_acks, timer_ints_to_push; timer_acks++;