From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 207E0C433E0 for ; Thu, 14 May 2020 08:57:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C9602206B6 for ; Thu, 14 May 2020 08:57:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="SxFDJft/" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726169AbgENI5r (ORCPT ); Thu, 14 May 2020 04:57:47 -0400 Received: from bilbo.ozlabs.org ([203.11.71.1]:59711 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726087AbgENI5r (ORCPT ); Thu, 14 May 2020 04:57:47 -0400 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 49N560671bz9sV7; Thu, 14 May 2020 18:57:44 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1589446665; bh=f+jbpOYr2BueXAYyks2x++b+r5NDkVQ3+2C6KvwHuEQ=; h=Date:From:To:Cc:Subject:From; b=SxFDJft/s9tO2tETt6wEbJd+SnjsIdmEGFey6c12jyhqqV2INDAqHXRx1tvjTwVMH 5WHJM9R3ESyou1wGsFjpHJA2nf0nZE732gM/TihvW71OJW2jrJqXBWWE56hXQJUoIL JVOzVmI+Aaft3IBeH91n4dzQft2ElOjzczttHQGfcae4ySKtumiZ45amZSVFSq7RFc BXsiodZUQ1C5an0B5q2j9ulgzvnFC3UKc56uIaT7hb+Ghh+uYZe/2sqKDYEqatkRa4 IhSDAV3rLsdpAX+SFjedBHGTNWej++Iv6sgmVSakxmIMSl2hx70ZXpQQwiI9JNBv72 eAL74YrQI561Q== Date: Thu, 14 May 2020 18:57:37 +1000 From: Stephen Rothwell To: Jens Axboe Cc: Linux Next Mailing List , Linux Kernel Mailing List , Ming Lei , Bart Van Assche Subject: linux-next: build failure after merge of the block tree Message-ID: <20200514185737.701b40dd@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/.ExBTlx8YTB9nd1mswu28VR"; protocol="application/pgp-signature"; micalg=pgp-sha256 Sender: linux-next-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org --Sig_/.ExBTlx8YTB9nd1mswu28VR Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, After merging the block tree, today's linux-next build (x86_64 allnoconfig) failed like this: In file included from include/linux/blk-cgroup.h:23, from include/linux/writeback.h:14, from include/linux/memcontrol.h:22, from include/linux/swap.h:9, from include/linux/suspend.h:5, from arch/x86/kernel/asm-offsets.c:13: include/linux/blkdev.h: In function 'blk_io_schedule': include/linux/blkdev.h:1857:26: error: 'sysctl_hung_task_timeout_secs' unde= clared (first use in this function) 1857 | unsigned long timeout =3D sysctl_hung_task_timeout_secs * HZ / 2; | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Caused by commit e6249cdd46e4 ("block: add blk_io_schedule() for avoiding task hung in syn= c dio") linux/sched/sysctl.h was not included since CONFIG_BLOCK is not defined. I have applied the following patch for today. From: Stephen Rothwell Date: Thu, 14 May 2020 18:48:32 +1000 Subject: [PATCH] fix for "block: add blk_io_schedule() for avoiding task hu= ng in sync dio" Signed-off-by: Stephen Rothwell --- include/linux/blkdev.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 5360696d85ff..bf99a723673b 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -4,6 +4,7 @@ =20 #include #include +#include =20 #ifdef CONFIG_BLOCK =20 @@ -27,7 +28,6 @@ #include #include #include -#include =20 struct module; struct scsi_ioctl_command; --=20 2.26.2 --=20 Cheers, Stephen Rothwell --Sig_/.ExBTlx8YTB9nd1mswu28VR Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl69CAEACgkQAVBC80lX 0Gy03ggApI7/YToKbRoFj73vKJWy+xfQg+3/ObkRZyoNfg1qOSEmhlRSpkRtDPDM mLM11SFYFbq+L67PacpAJcuaVykmqTZ3zkuw6A9RxgLQ9tqhF2eqAIwcWgv+OLj5 AJ5SyV7F9e3MqsvJfqob6qw/g1c7k8Qm5u0mGqBbUxG7e6D0SR6H+LKwKwKtVDG1 pXtgNO53RwkPCid6F+ErviOffWi+cE2/ydegrfJYfZTMUga7CJynFcOtnDiQ/B1K mTClnpQH12Q7ScaY12WuWpDFwbLqz+rmJZBHaYHMfx8XGxZcTiOTDnW6hs69ULBm eYzMEw1opB1tTxwdWCcinYpmCrQd/Q== =vw1D -----END PGP SIGNATURE----- --Sig_/.ExBTlx8YTB9nd1mswu28VR--