From b402f31023d50343a14ff8a83d918094843d3b91 Mon Sep 17 00:00:00 2001
From: Avi Kivity <avi@redhat.com>
Date: Thu, 22 Jan 2009 15:16:18 +0200
Subject: [PATCH] kvm: external module: compatibility for hrtimer_expires_remaining()

(cherry picked from commit 3f7cba35281a5b2dba008179a4979d737105574d)

Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Acked-by: Marcelo Tosatti <mtosatti@redhat.com>
Acked-by: Eduardo Habkost <ehabkost@redhat.com>
Bugzilla: 485482
---
 kernel/external-module-compat-comm.h |   14 ++++++++++++++
 kernel/ia64/hack-module.awk          |    1 +
 kernel/x86/hack-module.awk           |    1 +
 3 files changed, 16 insertions(+), 0 deletions(-)

diff --git a/kernel/external-module-compat-comm.h b/kernel/external-module-compat-comm.h
index 0b50e1e..b86ed61 100644
--- a/kernel/external-module-compat-comm.h
+++ b/kernel/external-module-compat-comm.h
@@ -619,6 +619,20 @@ static inline void kvm_hrtimer_start_expires(struct hrtimer *timer, int mode)
 
 #endif
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27)
+
+static inline ktime_t kvm_hrtimer_expires_remaining(const struct hrtimer *timer)
+{
+    return ktime_sub(timer->expires, timer->base->get_time());
+}
+
+#else
+
+#define kvm_hrtimer_expires_remaining hrtimer_expires_remaining
+
+#endif
+
+
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,28)
 
 static inline int pci_reset_function(struct pci_dev *dev)
diff --git a/kernel/ia64/hack-module.awk b/kernel/ia64/hack-module.awk
index a26d567..d0ef130 100644
--- a/kernel/ia64/hack-module.awk
+++ b/kernel/ia64/hack-module.awk
@@ -1,6 +1,7 @@
 BEGIN { split("INIT_WORK on_each_cpu smp_call_function " \
 	      "hrtimer_add_expires_ns hrtimer_get_expires " \
 	      "hrtimer_get_expires_ns hrtimer_start_expires " \
+	      "hrtimer_expires_remaining " \
 	      "request_irq", compat_apis); }
 
 /MODULE_AUTHOR/ {
diff --git a/kernel/x86/hack-module.awk b/kernel/x86/hack-module.awk
index 67d3094..c04e073 100644
--- a/kernel/x86/hack-module.awk
+++ b/kernel/x86/hack-module.awk
@@ -1,6 +1,7 @@
 BEGIN { split("INIT_WORK tsc_khz desc_struct ldttss_desc64 desc_ptr " \
 	      "hrtimer_add_expires_ns hrtimer_get_expires " \
 	      "hrtimer_get_expires_ns hrtimer_start_expires " \
+	      "hrtimer_expires_remaining " \
 	      "on_each_cpu relay_open request_irq" , compat_apis); }
 
 /^int kvm_init\(/ { anon_inodes = 1 }
-- 
1.6.1