From patchwork Wed Jan 13 13:25:55 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 101176 Delivered-To: patch@linaro.org Received: by 10.112.130.2 with SMTP id oa2csp3363509lbb; Wed, 13 Jan 2016 05:28:01 -0800 (PST) X-Received: by 10.66.253.97 with SMTP id zz1mr154346094pac.106.1452691681088; Wed, 13 Jan 2016 05:28:01 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id qn16si2055607pab.207.2016.01.13.05.28.00; Wed, 13 Jan 2016 05:28:01 -0800 (PST) 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 S1757813AbcAMN16 (ORCPT + 29 others); Wed, 13 Jan 2016 08:27:58 -0500 Received: from mout.kundenserver.de ([212.227.126.131]:61699 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757242AbcAMN1z (ORCPT ); Wed, 13 Jan 2016 08:27:55 -0500 Received: from wuerfel.localnet ([134.3.118.24]) by mrelayeu.kundenserver.de (mreue001) with ESMTPSA (Nemesis) id 0Lo5wv-1ZiLvj2ULR-00gE1w; Wed, 13 Jan 2016 14:25:58 +0100 From: Arnd Bergmann To: akpm@linux-foundation.org Cc: mmarek@suse.com, Peter Chen , Randy Dunlap , Joern Engel , Prasad Joshi , linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH] logfs: clarify MTD dependency Date: Wed, 13 Jan 2016 14:25:55 +0100 Message-ID: <5776957.XLg438VUOx@wuerfel> User-Agent: KMail/4.11.5 (Linux/3.16.0-10-generic; KDE/4.11.5; x86_64; ; ) MIME-Version: 1.0 X-Provags-ID: V03:K0:vRxvba5kHg41fJHSEY5ivh9kHnBCd7NaRJ2PtBfKdvqbHsZnEzZ 9UwcLsowRTb7ktWsP/DuYl3b6ZIAW2ii8N6u3jP2dgEW05i7ZZC4K6Dw+Z+UlAC90gvGzu/ P5e2LQCe3Smn0RtW4u5M3eE1BmaOMKB5Nx9JhDo62n30yiaSXwJw8uX8JUMZP972qPYo02T QiJWQIdWM/w/LvhmpunCw== X-UI-Out-Filterresults: notjunk:1; V01:K0:ESlGW8VDViA=:tsOcV0oA3AqRcZDvWD7NK4 LfGZppYWVY0uNDEmRoksNzen/VURiDJ4uqDY3oXbRy5qf9QeUKU//6mNqq7adxeCZXfhoFk10 D4V1Gbeyt+5Gc9M9LTitAgkdxvdrEj6YH9QOyQjiFFmdd2PwoNuMEM76xi6AZLBx5iZ++EfTp hMmPyEmQEFlpNz2acR8ghRUftZVA8ciLAcxjl9B4Z66TvS6YBZav13LgBHm2gmPRWp88f7H3I RbKFCBYV/TM+z4AgfLY/Fe/3YT2Sf+eZnr0NNWDMXC63LXFyI39zNTjPwI0I+DlG/O32eTX2+ U2H1714AP9SQ7eBGT+PQtnSLlZAsXaD09SDpkHq53FiyLbojH97alz/PtUgxVhw5zgYD0Uu7k KPR21/+MQtvO+38LjZddtpgbOYBHWfR2fe1cUOVioe3GL4hIPPdvcWKVkcI30OZtUqrSzb2Wl 3vIuTt2NhJCv+bFU/XaC9nlg4xG0AA9vPVjGBlUqdkA8MJ9azB5GsifCr23+lFCbF3dciXVXr n/Zmjt70KeYquiiFk/RY0OtzNI+P8hMFQ3zEb/Q0giu1oUUjwGiECvJA2A8ZyU+TWc8NpJNsq sF7TI/ZSJyfRachMigWR6ZkBM06LdROqPnJCBFdZ2IPimiS81LIc/5R0F7aJ4YfljuKxuMi+b Z9rmLMhZuxihx83tZAB2PzOWGoOSGfgoTeuURXgDx+6iRMQeZcOnIkb8LNOXoW6XwPYh6pGAe cpLYmeLAot4FBnHk Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org After a change to the way that composite modules work, we get a logfs build error: fs/built-in.o: In function `logfs_mount': :(.text+0x139d34): undefined reference to `logfs_get_sb_mtd' fs/built-in.o: In function `logfs_get_sb_bdev': :(.text+0x13aa08): undefined reference to `logfs_get_sb_mtd' This patch avoids the error by changing the dependencies of logfs in a way that we can no longer configure logfs as built-in when the MTD core is a loadable module, while leaving the dependency to require at least one of MTD or BLOCK to be enabled. Another patch tried to work around the problem, but accidentally dropped the dependency on 'BLOCK || MTD', allowing the file system to be built if neither is selected. Signed-off-by: Arnd Bergmann Fixes: cf4f21938e13 ("kbuild: Allow to specify composite modules with modname-m") Fixes: e6be296f680c ("logfs: fix logfs build errors and dependencies") --- I originally sent the patch November 27, but the discussion did not conclude, see https://lkml.org/lkml/2015/11/27/299 This version is rebased on the patch that got applied yesterday. Signed-off-by: Arnd Bergmann Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton diff --git a/fs/logfs/Kconfig b/fs/logfs/Kconfig index 2b1485a5c086..2b4503163930 100644 --- a/fs/logfs/Kconfig +++ b/fs/logfs/Kconfig @@ -1,7 +1,6 @@ config LOGFS tristate "LogFS file system" - depends on BLOCK || BLOCK=n - depends on MTD || MTD=n + depends on MTD || (!MTD && BLOCK) select ZLIB_INFLATE select ZLIB_DEFLATE select CRC32