From: Avi Kivity <a...@redhat.com> Signed-off-by: Avi Kivity <a...@redhat.com>
diff --git a/kernel/external-module-compat-comm.h b/kernel/external-module-compat-comm.h index 5cb70b0..981dc96 100644 --- a/kernel/external-module-compat-comm.h +++ b/kernel/external-module-compat-comm.h @@ -613,6 +613,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 1840c47..cc50856 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 } -- To unsubscribe from this list: send the line "unsubscribe kvm-commits" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html