From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751576AbbL1Ac7 (ORCPT ); Sun, 27 Dec 2015 19:32:59 -0500 Received: from shadbolt.e.decadent.org.uk ([88.96.1.126]:38676 "EHLO shadbolt.e.decadent.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751348AbbL1Acx (ORCPT ); Sun, 27 Dec 2015 19:32:53 -0500 Date: Mon, 28 Dec 2015 00:32:48 +0000 From: Ben Hutchings To: linux-kernel@vger.kernel.org Cc: stable-rt@vger.kernel.org Message-ID: <20151228003247.GY28542@decadent.org.uk> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="bW7Nw90iaNQhVLQB" Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) X-SA-Exim-Connect-IP: X-SA-Exim-Mail-From: ben@decadent.org.uk Subject: [PATCH RT] Fix build error in kernel/time/hrtimer.c X-SA-Exim-Version: 4.2.1 (built Mon, 26 Dec 2011 16:24:06 +0000) X-SA-Exim-Scanned: Yes (on shadbolt.decadent.org.uk) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --bW7Nw90iaNQhVLQB Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Move declaration of hrtimer_wakeup() above its first use. Signed-off-by: Ben Hutchings --- This is against 4.4-rc6-rt1, after latency-hist.patch. hrtimer-fixup-hrtimer-callback-changes-for-preempt-r.patch will need to be refreshed after applying this. Ben. --- a/kernel/time/hrtimer.c +++ b/kernel/time/hrtimer.c @@ -1266,6 +1266,8 @@ cpu_base->running =3D NULL; } =20 +static enum hrtimer_restart hrtimer_wakeup(struct hrtimer *timer); + static void __hrtimer_run_queues(struct hrtimer_cpu_base *cpu_base, ktime_= t now) { struct hrtimer_clock_base *base =3D cpu_base->clock_base; @@ -1316,8 +1318,6 @@ =20 #ifdef CONFIG_HIGH_RES_TIMERS =20 -static enum hrtimer_restart hrtimer_wakeup(struct hrtimer *timer); - /* * High resolution timer interrupt * Called with interrupts disabled --bW7Nw90iaNQhVLQB Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIVAwUBVoCDL+e/yOyVhhEJAQqTow/6A222N1agW/XQehOJfmbHNRO4VTGdJy6s 0JbpZ+WpAxs+s9x8/E6BxlhX2JzHjobgh0boXEkuTORZDeEsefwfUYpYcure1yul +IZ71fvBa7rhWoPZ5lho1g2sPu8hQ4DNM/md2F5HXyiX1yaZepxOUWL+yCbC27ll anRHorQoaWNd/qscJX0M/KvOdExr5rdSIPmq6G64OGglKBIn0CfD4ayCJDvNO6Ja Dv7X7GetQRXcwx8WIfxUnwKlKTl3WFrvxZC9CW67MBRl86/ceqGOzWojGFqJNEMk 58URdd7VjEd24WoWOsET69UrllnN9GUPoyobXldZWwtnzEQDhxoIjRq9d2nHnnca DfN5zhhJ4V0OQyrPd7NMj8o2zwZYt3UgRYDqb0CDCyLVGHdLfzyQ9X/a7pm3wyyj LThOOyMyUrxmGruhFViO0z32G3pTW2HAlhbKVDI69XGhOvikl2jT4S7b1T96FZIL gKqwlEXu2ABrLj4R6gP9OzqZRtAZIjpvhEq76G06EC9H3d4ug6KxbMAVWkbmPjQc iizE6g4iqnTEXQqiaVr+6ilyfiSY0Mw35ixOGtqez6RgTYx6zkmLcfQmSULE96Bp Eh0EI7AEXbD0JcYBXbQtAud19tywuJwnZ4nDo9PyRpol0964lBHXe3YXEtW7PFow f0faX9x35rQ= =92pa -----END PGP SIGNATURE----- --bW7Nw90iaNQhVLQB--