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.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 08C66C04E87 for ; Mon, 20 May 2019 12:38:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D1B4320815 for ; Mon, 20 May 2019 12:38:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558355930; bh=T8dAJpl6NQ3up2szpVSvaWP2GQMjzLSzmhNE8uxP6YY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=MYbh+ftZyWN/+XYQ1DlIR+Dp39kHMItQ/q91aluwsQAyEiT/KvvSsv4y/6ZCjt4hI pYTsw8E2WN+X03iePR1ArgwAnNMWqcObPGljkMCrLdueRoZoh55gdlrwjO19LfhMm0 BDkNgw9Oprg22M8kqodE1/T3OAU5/UXV327UQl+o= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390976AbfETMem (ORCPT ); Mon, 20 May 2019 08:34:42 -0400 Received: from mail.kernel.org ([198.145.29.99]:52168 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387444AbfETMel (ORCPT ); Mon, 20 May 2019 08:34:41 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7758320645; Mon, 20 May 2019 12:34:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558355681; bh=T8dAJpl6NQ3up2szpVSvaWP2GQMjzLSzmhNE8uxP6YY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zxABOdsmYE+WXf1bvj+PYKKuDdzkpBJ2uU39F1UYvpo13SodPtEddnxzkHiqFWMkK xAlRpF9z5z1Zoqn3liRDGdEXTxu/xU0z2/zHQ9HPXIiB3jKCZaI8hhI3/dQKBg7UBM mVtZr5DlpgooBtwuvjS2UMaBVsKAX+kfPOLwBEmo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, "Aneesh Kumar K.V" , Dan Williams Subject: [PATCH 5.1 043/128] drivers/dax: Allow to include DEV_DAX_PMEM as builtin Date: Mon, 20 May 2019 14:13:50 +0200 Message-Id: <20190520115252.634655843@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190520115249.449077487@linuxfoundation.org> References: <20190520115249.449077487@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Aneesh Kumar K.V commit 67476656febd7ec5f1fe1aeec3c441fcf53b1e45 upstream. This move the dependency to DEV_DAX_PMEM_COMPAT such that only if DEV_DAX_PMEM is built as module we can allow the compat support. This allows to test the new code easily in a emulation setup where we often build things without module support. Cc: Fixes: 730926c3b099 ("device-dax: Add /sys/class/dax backwards compatibility") Signed-off-by: Aneesh Kumar K.V Signed-off-by: Dan Williams Signed-off-by: Greg Kroah-Hartman --- drivers/dax/Kconfig | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- a/drivers/dax/Kconfig +++ b/drivers/dax/Kconfig @@ -23,7 +23,6 @@ config DEV_DAX config DEV_DAX_PMEM tristate "PMEM DAX: direct access to persistent memory" depends on LIBNVDIMM && NVDIMM_DAX && DEV_DAX - depends on m # until we can kill DEV_DAX_PMEM_COMPAT default DEV_DAX help Support raw access to persistent memory. Note that this @@ -50,7 +49,7 @@ config DEV_DAX_KMEM config DEV_DAX_PMEM_COMPAT tristate "PMEM DAX: support the deprecated /sys/class/dax interface" - depends on DEV_DAX_PMEM + depends on m && DEV_DAX_PMEM=m default DEV_DAX_PMEM help Older versions of the libdaxctl library expect to find all