From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934019AbcA0QAR (ORCPT ); Wed, 27 Jan 2016 11:00:17 -0500 Received: from mout.kundenserver.de ([217.72.192.73]:60206 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754867AbcA0QAJ (ORCPT ); Wed, 27 Jan 2016 11:00:09 -0500 From: Arnd Bergmann To: "Martin K. Petersen" , James.Bottomley@HansenPartnership.com Cc: linux-arm-kernel@lists.infradead.org, Arnd Bergmann , linux-scsi@vger.kernel.org, "James E.J. Bottomley" , Mike Snitzer , Hannes Reinecke , linux-kernel@vger.kernel.org Subject: [PATCH 7/7] scsi_dh: force modular build if SCSI is a module Date: Wed, 27 Jan 2016 16:57:23 +0100 Message-Id: <1453910247-3447628-8-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1453910247-3447628-1-git-send-email-arnd@arndb.de> References: <1453910247-3447628-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:jv3alVpEP3rp+wGigudnXRaLUICW6kpJmTnJqnkI6jK+Xz7QVAU 0vw6D7/dZDMESP/1RjMN0w4VvNhhQ7FfG4K5GkLvMzPMAZtH/4UMUDNKUhbytI6R49FIZGG lqUw21nshyAUkiVzXvorjOHXkwaEdUl3wRk4JJk2dEUi5SQ8SYH/KXWFaRC7BKWzSNQtmOQ QosJ6eYCECELQzLjRMPYQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:3dQ1g9Og6eM=:KD9jL70jzWwk1k18vwPUH3 jzB8xQ92726RHWNiDH+KIfpZW4A70ldQM2UAdvacw4TEOrrUOdLjhe9NhX8AFX3Dn9hVlsg9D l4xCyK13OQiLxdwqM9ggA5cYnPIqqtyMPRnLk0/wbYdMBVlQ47WO78OdirkfjZJWtZRVq3PcD QrpavKsrCWlSHuuc/OaEKIIk3pwXw7TGsqIgEz5ki+gwMhPGwqbjG0wodvpvwMdsBkJ/+Bv2a jkJKa/hIr2bfElA1xLcqwSxZNd1heO5+IvbJHQ2oaV0LzoNsss00rPYnbS4kg3GW2jxvPg5ch Oz+3Qe4ZatzagqO2bwkIWR4WPP7edD2QbL0eUQtOEPQFOP4qUsnD2rif7e3CazYdE3E4OLejW 2DrxoG5qvwY7mNez2xA/lOHKn9Cz9UR5LVmDJotm1NBGEBiHT3DQW57sAhw/sBuRrjBP2TC4i wV8b5u0XFZ0OwAD6K2wjUeqLcpSqsWPWlwFpij9VBS5rhfHG/2ve2WQyEFYpBtAwNqGT82lDn Bkw9J7dCHlAEx8PUkXEuURLMnFQEhrxJcNzlPgzAtZ8WMu9FUTHdQwpYmBU4mNe2SLiVykvZ4 9jKgRoEWJ9G6edc9wwGxkoLy5APDTk7PdUNnVtOBZ0sxHj6Q5AKZd6x2EAVTwhk6ROkNj8GP2 DnaruX6IH3+98tgstZJSra4odGE+U4S2PugALQ58ecijcRpnxz0DLIi/ZJZH2aPQPZOg= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When the scsi_dh core was moved into the scsi core module, CONFIG_SCSI_DH became a 'bool' option, and now anything depending on it can be built-in even when CONFIG_SCSI=m. This of course cannot link successfully: drivers/scsi/built-in.o: In function `rdac_init': scsi_dh_alua.c:(.init.text+0x14): undefined reference to `scsi_register_device_handler' scsi_dh_alua.c:(.init.text+0x64): undefined reference to `scsi_unregister_device_handler' drivers/scsi/built-in.o: In function `alua_init': scsi_dh_alua.c:(.init.text+0xb0): undefined reference to `scsi_register_device_handler' As a workaround, this adds an extra dependency on CONFIG_SCSI, so Kconfig can figure out whether built-in is allowed or not. Signed-off-by: Arnd Bergmann Fixes: 086b91d052eb ("scsi_dh: integrate into the core SCSI code") --- drivers/scsi/device_handler/Kconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/scsi/device_handler/Kconfig b/drivers/scsi/device_handler/Kconfig index e5647d59224f..0b331c9c0a8f 100644 --- a/drivers/scsi/device_handler/Kconfig +++ b/drivers/scsi/device_handler/Kconfig @@ -13,13 +13,13 @@ menuconfig SCSI_DH config SCSI_DH_RDAC tristate "LSI RDAC Device Handler" - depends on SCSI_DH + depends on SCSI_DH && SCSI help If you have a LSI RDAC select y. Otherwise, say N. config SCSI_DH_HP_SW tristate "HP/COMPAQ MSA Device Handler" - depends on SCSI_DH + depends on SCSI_DH && SCSI help If you have a HP/COMPAQ MSA device that requires START_STOP to be sent to start it and cannot upgrade the firmware then select y. @@ -27,13 +27,13 @@ config SCSI_DH_HP_SW config SCSI_DH_EMC tristate "EMC CLARiiON Device Handler" - depends on SCSI_DH + depends on SCSI_DH && SCSI help If you have a EMC CLARiiON select y. Otherwise, say N. config SCSI_DH_ALUA tristate "SPC-3 ALUA Device Handler" - depends on SCSI_DH + depends on SCSI_DH && SCSI help SCSI Device handler for generic SPC-3 Asymmetric Logical Unit Access (ALUA). -- 2.7.0