[linux] 02/02: Fix backport of "KVM: lapic: mark LAPIC timer handler as irqsafe" to 3.2-rt

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch wheezy
in repository linux.

commit 4a6427d0bc2f1e7d8e4f432048f015b56493421e
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Mon Sep 21 23:01:35 2015 +0200

    Fix backport of "KVM: lapic: mark LAPIC timer handler as irqsafe" to 3.2-rt
---
 .../0371-KVM-lapic-mark-LAPIC-timer-handler-as-irqsafe.patch | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/debian/patches/features/all/rt/0371-KVM-lapic-mark-LAPIC-timer-handler-as-irqsafe.patch b/debian/patches/features/all/rt/0371-KVM-lapic-mark-LAPIC-timer-handler-as-irqsafe.patch
index dd2282a..287dd35 100644
--- a/debian/patches/features/all/rt/0371-KVM-lapic-mark-LAPIC-timer-handler-as-irqsafe.patch
+++ b/debian/patches/features/all/rt/0371-KVM-lapic-mark-LAPIC-timer-handler-as-irqsafe.patch
@@ -15,28 +15,22 @@ Cc: stable-rt at vger.kernel.org
 Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>
 Signed-off-by: Sebastian Andrzej Siewior <bigeasy at linutronix.de>
 Signed-off-by: Steven Rostedt <rostedt at goodmis.org>
+[bwh: Fix backport: apic_timer_fn() is called kvm_timer_fn() in 3.2]
 ---
- arch/x86/kvm/lapic.c | 42 +++++++++++++++++++++++++++++++++++++++---
- 1 file changed, 39 insertions(+), 3 deletions(-)
-
-diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
-index 176205a..745cbfe 100644
 --- a/arch/x86/kvm/lapic.c
 +++ b/arch/x86/kvm/lapic.c
-@@ -679,8 +679,38 @@ static void update_divide_count(struct kvm_lapic *apic)
+@@ -679,8 +679,36 @@ static void update_divide_count(struct kvm_lapic *apic)
  				   apic->divide_count);
  }
  
 +
-+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 {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git