From 170e17909cf37bcf06dd77d5772c8a02e7f5fb11 Mon Sep 17 00:00:00 2001
From: Avi Kivity <avi@redhat.com>
Date: Wed, 4 Feb 2009 19:21:07 +0200
Subject: [PATCH 1/3] kvm: external module: hrtimer_expires_remaining was introduced in 2.6.28

Noted by Alexander Graf.

(cherry picked from commit 034e9938f4336f69d643a23ae4b18fa0e6524c9b)

Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
RH-Upstream-status: applied(kvm/master)
Bugzilla: 493112
Acked-by: Marcelo Tosatti <mtosatti@redhat.com>
Acked-by: Eduardo Habkost <ehabkost@redhat.com>
Acked-by: Juan Quintela <quintela@redhat.com>
---
 kernel/external-module-compat-comm.h |   16 ++++------------
 1 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/kernel/external-module-compat-comm.h b/kernel/external-module-compat-comm.h
index 970b40d..5649d33 100644
--- a/kernel/external-module-compat-comm.h
+++ b/kernel/external-module-compat-comm.h
@@ -606,17 +606,6 @@ static inline void kvm_hrtimer_start_expires(struct hrtimer *timer, int mode)
 	hrtimer_start_p(timer, timer->expires, mode);
 }
 
-#else
-
-#define kvm_hrtimer_add_expires_ns hrtimer_add_expires_ns
-#define kvm_hrtimer_get_expires hrtimer_get_expires
-#define kvm_hrtimer_get_expires_ns hrtimer_get_expires_ns
-#define kvm_hrtimer_start_expires hrtimer_start_expires
-
-#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());
@@ -624,11 +613,14 @@ static inline ktime_t kvm_hrtimer_expires_remaining(const struct hrtimer *timer)
 
 #else
 
+#define kvm_hrtimer_add_expires_ns hrtimer_add_expires_ns
+#define kvm_hrtimer_get_expires hrtimer_get_expires
+#define kvm_hrtimer_get_expires_ns hrtimer_get_expires_ns
+#define kvm_hrtimer_start_expires hrtimer_start_expires
 #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)
-- 
1.6.1