mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Ben Hutchings <ben@decadent.org.uk>
To: linux-kernel@vger.kernel.org
Cc: stable-rt@vger.kernel.org
Subject: [PATCH RT 1/4] KVM: lapic: Fix name of timer handler before 3.7
Date: Tue, 06 Oct 2015 03:55:29 +0100	[thread overview]
Message-ID: <1444100129.2956.6.camel@decadent.org.uk> (raw)
In-Reply-To: <1444099292.2956.4.camel@decadent.org.uk>

[-- Attachment #1: Type: text/plain, Size: 945 bytes --]

The timer handler was named kvm_timer_fn, not apic_timer_fn, before
Linux 3.7.

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Cc: <stable-rt@vger.kernel.org> # 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 #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 811 bytes --]

  reply	other threads:[~2015-10-06  2:55 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-10-06  2:41 [PATCH RT 0/4] Warning fixes for PREEMPT_RT Ben Hutchings
2015-10-06  2:55 ` Ben Hutchings [this message]
2015-10-06  2:55 ` [PATCH RT 2/4] rtmutex: Fix rt_mutex_timed_fastlock() slowfn type mismatch up to 3.10 Ben Hutchings
2015-10-06  2:55 ` [PATCH RT 3/4] genirq: Fix pointer cast warning for randomness on 32-bit architectures Ben Hutchings
2015-10-06  2:55 ` [PATCH RT 4/4] work-simple: Add missing #include <linux/export.h> Ben Hutchings
2015-11-21  0:20 ` [PATCH RT 0/4] Warning fixes for PREEMPT_RT Ben Hutchings
2015-11-23 14:36   ` Steven Rostedt

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1444100129.2956.6.camel@decadent.org.uk \
    --to=ben@decadent.org.uk \
    --cc=linux-kernel@vger.kernel.org \
    --cc=stable-rt@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

Powered by JetHome