Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752070AbbBWKJM (ORCPT ); Mon, 23 Feb 2015 05:09:12 -0500 Received: from mout.kundenserver.de ([212.227.17.13]:54366 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751312AbbBWKJL (ORCPT ); Mon, 23 Feb 2015 05:09:11 -0500 From: Arnd Bergmann To: Jens Axboe Cc: Keith Busch , linux-nvme@lists.infradead.org, Matthew Wilcox , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH] NVMe: add explicit BLK_DEV_INTEGRITY dependency Date: Mon, 23 Feb 2015 11:08:50 +0100 Message-ID: <6241161.LKiT8yUlIj@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-Provags-ID: V03:K0:KjZqRzZ8ZqBmTE2zt5JEnAfowfzM0gBzoBX8BcXnWxXb/rVKm+A mwFbSDY1Ly6H81A2uaVT2sB5o5vYLuRVhkEcHAQeezXr51/UiG6SOCj3RoMrtX1N9QZqpln RHPMaecZPrb23ya6LJEebPT+ggrQmmfdnWPKnobe/7GPZP44GYu9QTh+OAxQxpB3yiI5CVX nxt/tgS3R/Mg1cqboR+VA== X-UI-Out-Filterresults: notjunk:1; Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1629 Lines: 41 A patch that was added to 4.0-rc1 in the last minute caused a build break in the NVMe driver unless integrity support is also enabled: drivers/block/nvme-core.c: In function 'nvme_dif_remap': drivers/block/nvme-core.c:523:24: error: dereferencing pointer to incomplete type pmap = kmap_atomic(bip->bip_vec->bv_page) + bip->bip_vec->bv_offset; ^ drivers/block/nvme-core.c:523:49: error: dereferencing pointer to incomplete type pmap = kmap_atomic(bip->bip_vec->bv_page) + bip->bip_vec->bv_offset; ^ This changes the Kconfig entry for NVMe to depend on that support, to avoid the build error. Using 'select' would work as well, but might have unintended side-effects when users do not actually want the integerity support. Signed-off-by: Arnd Bergmann Fixes: e1e5e5641e6f ("NVMe: Metadata format support") --- Found on ARM randconfig builds diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig index 1b8094d4d7af..e386dd5b94e9 100644 --- a/drivers/block/Kconfig +++ b/drivers/block/Kconfig @@ -312,7 +312,7 @@ config BLK_DEV_NBD config BLK_DEV_NVME tristate "NVM Express block device" - depends on PCI + depends on PCI && BLK_DEV_INTEGRITY ---help--- The NVM Express driver is for solid state drives directly connected to the PCI or PCI Express bus. If you know you -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/