From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752079AbbJFCzt (ORCPT ); Mon, 5 Oct 2015 22:55:49 -0400 Received: from shadbolt.e.decadent.org.uk ([88.96.1.126]:48188 "EHLO shadbolt.e.decadent.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751906AbbJFCzr (ORCPT ); Mon, 5 Oct 2015 22:55:47 -0400 Message-ID: <1444100140.2956.7.camel@decadent.org.uk> Subject: [PATCH RT 2/4] rtmutex: Fix rt_mutex_timed_fastlock() slowfn type mismatch up to 3.10 From: Ben Hutchings To: linux-kernel@vger.kernel.org Cc: stable-rt@vger.kernel.org Date: Tue, 06 Oct 2015 03:55:40 +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="=-+6QGQ8fqzA7oikiG2dnX" 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 --=-+6QGQ8fqzA7oikiG2dnX Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable The type of the slowfn parameter is declared incorrectly in some of the backports, resulting in: kernel/rtmutex.c: In function 'rt_mutex_timed_futex_lock': kernel/rtmutex.c:1730:12: warning: passing argument 5 of 'rt_mutex_timed_fa= stlock' from incompatible pointer type [enabled by default] kernel/rtmutex.c:1655:1: note: expected 'int (*)(struct rt_mutex *, int, s= truct hrtimer_sleeper *, int)' but argument is of type 'int (*)(struct rt_m= utex *, int, struct hrtimer_sleeper *, enum rtmutex_chainwalk)' kernel/rtmutex.c: In function 'rt_mutex_timed_lock': kernel/rtmutex.c:1770:12: warning: passing argument 5 of 'rt_mutex_timed_fa= stlock' from incompatible pointer type [enabled by default] kernel/rtmutex.c:1655:1: note: expected 'int (*)(struct rt_mutex *, int, s= truct hrtimer_sleeper *, int)' but argument is of type 'int (*)(struct rt_m= utex *, int, struct hrtimer_sleeper *, enum rtmutex_chainwalk)' Signed-off-by: Ben Hutchings Cc: # 3.2 3.4 3.10 --- kernel/rtmutex.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/rtmutex.c b/kernel/rtmutex.c index 52cab27..26550b6 100644 --- a/kernel/rtmutex.c +++ b/kernel/rtmutex.c @@ -1657,7 +1657,7 @@ rt_mutex_timed_fastlock(struct rt_mutex *lock, int st= ate, enum rtmutex_chainwalk chwalk, int (*slowfn)(struct rt_mutex *lock, int state, struct hrtimer_sleeper *timeout, - int detect_deadlock)) + enum rtmutex_chainwalk chwalk)) { if (chwalk =3D=3D RT_MUTEX_MIN_CHAINWALK && likely(rt_mutex_cmpxchg(lock, NULL, current))) { --=20 Ben Hutchings All the simple programs have been written, and all the good names taken. --=-+6QGQ8fqzA7oikiG2dnX Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIVAwUAVhM4LOe/yOyVhhEJAQrB9Q//bJFRObrzF0qtGecJAYQfs4K4KDStgYXf YQNjodA0w6TMNtA144FVdVlJBQNF3bSd58N5JdtMdmKP7WIXfPOKLIWBA2fQ36vj 172PupwlGWDM3hymUZKBuddP9PdMeRMlIUiNGHjY3WnZvKBSIkLUy0EzKyN4gdmb Lz1EmJjdTUTRAX+i8vRfCcp3O2zTWJ+ElYPcDC+1buHFujplxhgBg6IruUwIcPqR H1ukamKsbVREgDJMl87uIoBG673J84em/7v7Ux06dwOLteUG5BMjmT2BzFkjq4bl Xn/IYf3KU6WnWe+brR5eOYoP0mfDhxqwkdvQP0wC6NHRvSZrcv1PU3b4tAzVwz9+ VpnGvuN2MdV5DbRfyFYJOuh/V/cEzYg8Zl0te97+jKPJosqzGe1MXpq1rHdHZsEL h8lU/vtMdkYS2gn04T+QdOeOLsKLS/xrzUj5FBdj6h1NIAriPfxFI3jnebzIvn2L qc5ddvbPFj/guiBcShvdaASR/FKRYCEObUqIa9njZYtpnyySpBAX/jk2lfM8Y1Im Y1HCsMW7nFgB4A7tk9dUrwihNkqVzC8SlyqI7bRTXClEDTs6+I0EGyNBkVNpnvZw 1GyeM9MQfU1Nl+cJ74xw671OCDTt6SU6rgJtnjxvmyIs5vkVTjsIm6kU7O+S5qS/ 9s4xznEoFJE= =0aCo -----END PGP SIGNATURE----- --=-+6QGQ8fqzA7oikiG2dnX--