linux-kernel - [PATCH A] scsi: fdomain: fix building pcmcia front-end

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20190722121908.163702-1-arnd@arndb.de>
Date:   Mon, 22 Jul 2019 14:19:07 +0200
From:   Arnd Bergmann <arnd@...db.de>
To:     "James E . J . Bottomley" <jejb@...ux.ibm.com>,
        "Martin K . Petersen" <martin.petersen@...cle.com>
Cc:     Ondrej Zary <linux@...y.sk>, Hannes Reinecke <hare@...e.com>,
        Johannes Thumshirn <jthumshirn@...e.de>,
        linux-scsi@...r.kernel.org, linux-kernel@...r.kernel.org,
        Arnd Bergmann <arnd@...db.de>
Subject: [PATCH A] scsi: fdomain: fix building pcmcia front-end

We get a warning when CONFIG_SCSI_LOWLEVEL is disabled here:

WARNING: unmet direct dependencies detected for SCSI_FDOMAIN
  Depends on [n]: SCSI_LOWLEVEL [=n] && SCSI [=y]
  Selected by [m]:
  - PCMCIA_FDOMAIN [=m] && SCSI_LOWLEVEL_PCMCIA [=y] && SCSI [=y] && PCMCIA [=y] && m && MODULES [=y]

Move the common support outside of the SCSI_LOWLEVEL section.
Alternatively, we could move all of SCSI_LOWLEVEL_PCMCIA into
SCSI_LOWLEVEL. This would be more sensible, but might cause
surprises for users that have SCSI_LOWLEVEL disabled.

Fixes: 7d47fa065e62 ("scsi: fdomain: Add PCMCIA support")
Link: https://lore.kernel.org/lkml/20190617111937.2355936-1-arnd@arndb.de/t
Signed-off-by: Arnd Bergmann <arnd@...db.de>
---
One of two ways to fix the problem, please pick either

There was some confusion about this the first time I posted
it. As Ondrej pointed out, there is no user visible top-level
option here, just a hidden symbol.

 drivers/scsi/Kconfig | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 75f66f8ad3ea..dffe4b31e205 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -642,10 +642,6 @@ config SCSI_DMX3191D
 	  To compile this driver as a module, choose M here: the
 	  module will be called dmx3191d.
 
-config SCSI_FDOMAIN
-	tristate
-	depends on SCSI
-
 config SCSI_FDOMAIN_PCI
 	tristate "Future Domain TMC-3260/AHA-2920A PCI SCSI support"
 	depends on PCI && SCSI
@@ -1527,6 +1523,10 @@ endif # SCSI_LOWLEVEL
 
 source "drivers/scsi/pcmcia/Kconfig"
 
+config SCSI_FDOMAIN
+	tristate
+	depends on SCSI
+
 source "drivers/scsi/device_handler/Kconfig"
 
 endmenu
-- 
2.20.0