From e04ce469fb6300bbdde5223227af1d52da49b26f Mon Sep 17 00:00:00 2001
From: Eduardo Habkost <ehabkost@redhat.com>
Date: Mon, 5 Oct 2009 14:32:46 -0300
Subject: [PATCH 4/6] For RHEl5.x return types of hrtimers is int

RH-Author: Juan Quintela <quintela@redhat.com>
Message-id: <792c41d1e0f71d892e52295f9322c44f25cfefe3.1253624246.git.quintela@trasno.org>
Patchwork-id: 3497
O-Subject: [PATCH 2/2] For RHEl5.x return types of hrtimers is int
Bugzilla: 515749
RH-Acked-by: Avi Kivity <avi@redhat.com>
RH-Acked-by: Markus Armbruster <armbru@redhat.com>
RH-Acked-by: Dor Laor <dlaor@redhat.com>

From: Juan Quintela <quintela@trasno.org>

Our internal tree is based in a newer kernel that returns
enum hrtimer_restart instead of int.

int(*function)(struct hrtimer *);

Signed-off-by: Juan Quintela <quintela@trasno.org>
---
 arch/x86/kvm/i8254.c |    2 +-
 arch/x86/kvm/lapic.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
 arch/x86/kvm/i8254.c |    2 +-
 arch/x86/kvm/lapic.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kvm/i8254.c b/arch/x86/kvm/i8254.c
index c13bb92..7fc515d 100644
--- a/arch/x86/kvm/i8254.c
+++ b/arch/x86/kvm/i8254.c
@@ -235,7 +235,7 @@ static void kvm_pit_ack_irq(struct kvm_irq_ack_notifier *kian)
 	spin_unlock(&ps->inject_lock);
 }
 
-static enum hrtimer_restart pit_timer_fn(struct hrtimer *data)
+static int pit_timer_fn(struct hrtimer *data)
 {
 	struct kvm_kpit_state *ps;
 	int restart_timer = 0;
diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
index a3978b1..4bd1aa3 100644
--- a/arch/x86/kvm/lapic.c
+++ b/arch/x86/kvm/lapic.c
@@ -996,7 +996,7 @@ void kvm_apic_nmi_wd_deliver(struct kvm_vcpu *vcpu)
 		kvm_apic_local_deliver(apic, APIC_LVT0);
 }
 
-static enum hrtimer_restart apic_timer_fn(struct hrtimer *data)
+static int apic_timer_fn(struct hrtimer *data)
 {
 	struct kvm_lapic *apic;
 	int restart_timer = 0;
-- 
1.6.3.rc4.29.g8146