From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751973AbbJFCzn (ORCPT ); Mon, 5 Oct 2015 22:55:43 -0400 Received: from shadbolt.e.decadent.org.uk ([88.96.1.126]:48187 "EHLO shadbolt.e.decadent.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751906AbbJFCzm (ORCPT ); Mon, 5 Oct 2015 22:55:42 -0400 Message-ID: <1444100129.2956.6.camel@decadent.org.uk> Subject: [PATCH RT 1/4] KVM: lapic: Fix name of timer handler before 3.7 From: Ben Hutchings To: linux-kernel@vger.kernel.org Cc: stable-rt@vger.kernel.org Date: Tue, 06 Oct 2015 03:55:29 +0100 In-Reply-To: <1444099292.2956.4.camel@decadent.org.uk> References: <1444099292.2956.4.camel@decadent.org.uk> Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-CsutZ/42meR9t+up3Z32" X-Mailer: Evolution 3.16.5-1 Mime-Version: 1.0 X-SA-Exim-Connect-IP: 192.168.4.247 X-SA-Exim-Mail-From: ben@decadent.org.uk X-SA-Exim-Scanned: No (on shadbolt.decadent.org.uk); SAEximRunCond expanded to false Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --=-CsutZ/42meR9t+up3Z32 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable The timer handler was named kvm_timer_fn, not apic_timer_fn, before Linux 3.7. Signed-off-by: Ben Hutchings Cc: # 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 *api= c) } =20 =20 -static enum hrtimer_restart apic_timer_fn(struct hrtimer *data); - static void apic_timer_expired(struct hrtimer *data) { int ret, i =3D 0; enum hrtimer_restart r; struct kvm_timer *ktimer =3D container_of(data, struct kvm_timer, timer); =20 - r =3D apic_timer_fn(data); + r =3D kvm_timer_fn(data); =20 if (r =3D=3D HRTIMER_RESTART) { do { --=20 Ben Hutchings All the simple programs have been written, and all the good names taken. --=-CsutZ/42meR9t+up3Z32 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIVAwUAVhM4Iee/yOyVhhEJAQpD9w//ZpZzrJwv1hxhaNPDNPj9zdFDf/XM5Bkf 3xpReueEVRKXSwDtQHBTv9/F3OYOwST589R8DKqtkw4oLr6iVCFWM2E2RT+tZ6t9 onBSr/xbU6m5ws1Ihz5lWtQRYV/WP3c1mZGJZKclFwKEhega7cikzu5nhumDUh7k C72aZon7t6vfwwzYkDSSjGfGS59EYtYfMnWQMH/2wfX2W4BYVwWr2fZsCUCsHHm+ VT7wP9oAFfnXwaASLE5QGK2IeapHRzY0k1nwKM/1CaSUSbyDb/HRKgh0mzNTH7Vd T1J9PyFmUT+LCXhVNsi9jujUrtRTZ9aoHw1OT4QxnVXoTPg82pRZEwX5vrj2iB1m UNdvpazXC5lHRSpe8216ytX46RxKMRXHMw2nYqBQT+MDw04sHI9yeYv/7jvdBr3z PhMBnt8x1mBUGeTkiMczQImkiiQkiIGviGmRGq30NOIVvqrf3gAywe29fk2pQugZ eBX89Atx9/5k0yne3ebGaaPm78qHL8WgvAy7Dk04xDYOa9YtG0sBn0BSgEyvBf2A 99ZyIlFEsqEyNNaSHeHUuSw8w4Q/ee/vehaOFhwZQ64tmLP50JVFmDLqCOthByZc YC0TWJNf2e7RU8RCW3c3xsMlDxxwL9Ce1bNpOEVXobSOxOvsewgwuSx8ZS8BRYml JCzNP9N+4BI= =N5Ek -----END PGP SIGNATURE----- --=-CsutZ/42meR9t+up3Z32--