The timer handler was named kvm_timer_fn, not apic_timer_fn, before
Linux 3.7.
Signed-off-by: Ben Hutchings <ben@xxxxxxxxxxxxxxx>
Cc: <stable-rt@xxxxxxxxxxxxxxx> # 3.2 3.4
---
arch/x86/kvm/lapic.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
index 7198be0..c661909 100644
--- a/arch/x86/kvm/lapic.c
+++ b/arch/x86/kvm/lapic.c
@@ -680,15 +680,13 @@ static void update_divide_count(struct kvm_lapic *apic)
}
-static enum hrtimer_restart apic_timer_fn(struct hrtimer *data);
-
static void apic_timer_expired(struct hrtimer *data)
{
int ret, i = 0;
enum hrtimer_restart r;
struct kvm_timer *ktimer = container_of(data, struct kvm_timer, timer);
- r = apic_timer_fn(data);
+ r = kvm_timer_fn(data);
if (r == HRTIMER_RESTART) {
do {
--
Ben Hutchings
All the simple programs have been written, and all the good names taken.Attachment:
signature.asc
Description: This is a digitally signed message part
