From patchwork Tue Sep 6 12:58:06 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 101863 Delivered-To: patch@linaro.org Received: by 10.140.106.11 with SMTP id d11csp534141qgf; Tue, 6 Sep 2016 05:58:55 -0700 (PDT) X-Received: by 10.66.157.103 with SMTP id wl7mr30211168pab.116.1473166735464; Tue, 06 Sep 2016 05:58:55 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id q10si27720327pfi.216.2016.09.06.05.58.55; Tue, 06 Sep 2016 05:58:55 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755474AbcIFM6w (ORCPT + 27 others); Tue, 6 Sep 2016 08:58:52 -0400 Received: from mout.kundenserver.de ([212.227.126.133]:53865 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754086AbcIFM6u (ORCPT ); Tue, 6 Sep 2016 08:58:50 -0400 Received: from wuerfel.lan. ([78.43.20.153]) by mrelayeu.kundenserver.de (mreue002) with ESMTPA (Nemesis) id 0MUhql-1bYDWX1pZb-00RFBL; Tue, 06 Sep 2016 14:57:58 +0200 From: Arnd Bergmann To: Keith Busch , Jens Axboe Cc: Christoph Hellwig , Arnd Bergmann , Jay Freyensee , Sagi Grimberg , Ming Lin , Jay Sternberg , linux-nvme@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] nvme: add back dependency on CONFIG_BLOCK Date: Tue, 6 Sep 2016 14:58:06 +0200 Message-Id: <20160906125827.1595094-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:EiF0eo1yrepou4RRg55GOtYXO8sB9WXFPSgY0yFNsCQiGG9ykNl 8ODX8iQK7uvr6sYuwen9U1mNiXUT1H8Uf4nIYOJSXggMdyizqx82XzuIReXcTXhoQtCkYkc puG0NkQKxv1CWUgJAQ53iCeCLs+VmsJ6wZMe16PS1ijdgbJO6PW57K51QhyhvwjcHlmwkRO 6kbodq4jBaaegY6ul/9fQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:41qH49QGSVc=:zbwDqoXPxn2jpAGzg2i0Fs a8fbg0bvJgOuFky3Kd6a/jocUzLazwx6biVMdXAotc4KiSgBpnpeVOebA87qQliMNjbcI2Ni7 WMCA/ygASgvq7jNrR5Q61VZKjQp6mN7CYilQHgctl1NCsgm8FKd5hj0J89oUpZ/JDPbBsP1yj UR/dzcu+BJqv1s/Bgi4LkFJyC21tt8Wl2GCoWiUGnsEmbaxTgFFjmCMNQlQ2p7hDmHWtZ7yVa W3TMFtL6jNPrqfIIQKarvQynaYNGYPcM663nlxLAmd10Ub3XIK5jj47nV3ma04SZ2k8xzqR8J YcvepicYlE++D3iMy0Tnn+pYWdf+AFFuF4xjWNot5Hf19Q8wzpZz3dVO4yta6E86Po5ot/S3C ghF+vGGUhs8WNCFTU77XOycwqAgFD3vAgdFjowf+RmRbL2ORUhNfxymPnQ5upM7yMGoXxacb0 3VH9rtnM0/zW66PvT/MC6JxaLZVHx0bMnWPCcKiBurxoiXh3nxTRGTAJX1a9uuEB3FCm8awGH ccuIovF77Y57D0tXt5LQYu++qRGyVYn5iOkpl37Mntp0KjZbQKzAzFUxKwKhDHJJzmBH5fOYC ku/F+3pEpUNdlZbYk32zotp4eZ7333G7ywTA/pYR0o1Bm1pAo67+99l070uNOc793YMTP3n+y Xz6b9l+cj3UfIy0VxEfKmkHWmtVsNA4RPoQ5+ylTakIKu6U16TK79lKE6FmSL4LCZxps= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org A recent change removed the dependency on BLK_DEV_NVME, which implies the dependency on PCI and BLOCK. We don't need CONFIG_PCI, but without CONFIG_BLOCK we get tons of build errors, e.g. In file included from drivers/nvme/host/core.c:16:0: linux/blk-mq.h:182:33: error: 'struct gendisk' declared inside parameter list will not be visible outside of this definition or declaration [-Werror] drivers/nvme/host/core.c: In function 'nvme_setup_rw': drivers/nvme/host/core.c:295:21: error: implicit declaration of function 'rq_data_dir' [-Werror=implicit-function-declaration] drivers/nvme/host/nvme.h: In function 'nvme_map_len': drivers/nvme/host/nvme.h:217:6: error: implicit declaration of function 'req_op' [-Werror=implicit-function-declaration] drivers/nvme/host/scsi.c: In function 'nvme_trans_bdev_limits_page': drivers/nvme/host/scsi.c:768:85: error: implicit declaration of function 'queue_max_hw_sectors' [-Werror=implicit-function-declaration] This adds back the specific CONFIG_BLOCK dependency to avoid broken configurations. Signed-off-by: Arnd Bergmann Fixes: aa71987472a9 ("nvme: fabrics drivers don't need the nvme-pci driver") --- drivers/nvme/host/Kconfig | 1 + 1 file changed, 1 insertion(+) -- 2.9.0 diff --git a/drivers/nvme/host/Kconfig b/drivers/nvme/host/Kconfig index 0c644f7bdf80..4b6cfff4b5be 100644 --- a/drivers/nvme/host/Kconfig +++ b/drivers/nvme/host/Kconfig @@ -31,6 +31,7 @@ config NVME_FABRICS config NVME_RDMA tristate "NVM Express over Fabrics RDMA host driver" depends on INFINIBAND + depends on BLOCK select NVME_CORE select NVME_FABRICS select SG_POOL