From patchwork Fri Nov 3 22:48:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 117968 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp263702qgn; Fri, 3 Nov 2017 15:49:03 -0700 (PDT) X-Google-Smtp-Source: ABhQp+R5VvByeDGMGG6HRGtJiub9Uxtg1pui/qWkcaqjL2nY89zpM+MNhA3DNVIvG2RB41ByyByK X-Received: by 10.101.81.139 with SMTP id h11mr8462183pgq.233.1509749343720; Fri, 03 Nov 2017 15:49:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1509749343; cv=none; d=google.com; s=arc-20160816; b=V9lC48WdJF6tJ1E3e5BihMlC9U6zmz1HvWv0gR4vqajRShiNZzHCX9Y8MHY2UQKoKE MpFR83k9i4nzQdzuJ63c/9qEPs/Q+6biF9PF4eJP3R/KfTjyH11mwhFcH03ORkXAWs2l jS3iR59NAEWShlfjzun6Yzj+jbcF8lseDVWa/g1MUMPVdtTuXFD5g8Gk4XcW4/cJIZkD VkrRtWflKePZub46x8HarY01i2qm45SCAC+pSk/CvrFDUJ2Fq8GxNJBtbE8ksMCxLyq3 0hOgp5k1h4nUlKjrxCZkXzreQoBsSXEe4cnK2gH6/m/IBe5Ce9mQETV40f7H1YBZ0Pbw hjfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=bEDjeJqstevJdhUlffJPTxveCrPTVg7P6jx1Yr1nu4s=; b=YN1WhSZbultXCsYlkcVIx+4Md6fuRN2eh6BCmJWJAkMAWKGYXPRJ9OjTWerq00jV4K iIdU3ZPJ4JGhlxPMp6KYFANYVNlK6J8PNwRoFHfKjWIy9d7qDMfq80Wb2Dvb3YNAP4e1 cXJKP8kJ4XYc60eGwJb3Z+TvlMDZ9VV5LQpdb0jjk4hFIMbWes7j5UhNszmpDM6eo3MC ggYy1k/gR+t1di3Gd9a9iM+aY8r+VXj3mZ5tjvsXaTVnL1kGlld4eHaE05hRZQnkC+3Y SEfWaEsBPUkf54aiSaodNQYSv4JQlIMRZuD/wtvCS+t+aEp77gGccuiShIpXHqQKlFtI rVCw== ARC-Authentication-Results: i=1; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f2si6049255plk.121.2017.11.03.15.49.03; Fri, 03 Nov 2017 15:49:03 -0700 (PDT) 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 S1754103AbdKCWtB (ORCPT + 26 others); Fri, 3 Nov 2017 18:49:01 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:52706 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751968AbdKCWs7 (ORCPT ); Fri, 3 Nov 2017 18:48:59 -0400 Received: from wuerfel.lan ([109.193.157.232]) by mrelayeu.kundenserver.de (mreue003 [212.227.15.129]) with ESMTPA (Nemesis) id 0MHcds-1e7Sye024C-003Qqx; Fri, 03 Nov 2017 23:48:36 +0100 From: Arnd Bergmann To: Jens Axboe , Bart Van Assche Cc: Arnd Bergmann , Hannes Reinecke , Thomas Gleixner , Shaohua Li , "Martin K. Petersen" , linux-kernel@vger.kernel.org Subject: [PATCH] cdrom: always select BLK_SCSI_REQUEST Date: Fri, 3 Nov 2017 23:48:17 +0100 Message-Id: <20171103224833.3921968-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:EybDKXZNjgSey7xdV92vXOEXeUshWSiY/fpJ57rHQqbEgj0W3sq oXzabsu7+8z6EQAlGKuRH7uPui1Ft0PYnufKkatmv5mVmUiCIpiT5YTwFzUXlY/0YRWgp7l l8TsJ9jKmbgrrlr2bv8DmoiARtCrtzHyyL5pnE7frkqWWjibngnt+UulLlOQqB5cUNQI+qF Laz9YjD3TcsjPq2muSduA== X-UI-Out-Filterresults: notjunk:1; V01:K0:cfsOUH4NTfU=:mUBlwtuFjxkjMw51UTBSq/ G77ryNbo0/oI1PpeVkmAoPjZAj7qal9a2izL6tFnbwvGD6Dch1M6qoQdW4tlqJfLmFZ2Lrg9I STqQq3nNPgV752nxfK9mxfu+MAnR5Gev49tOrTW7xxwxV9V8DRnPbZmilUaMlhSYw0BPMDFAq JgUeGZCoRiqppr8uobuzkbWdVcQf6zKP20XZDRfYp0SF95nOiuFoGje+Og7RfoNRspShz6jH2 1Vbxsn4kqIYDJ8KwRNF4OGxn1F/lCXQtl3SMAPFZy0D/Q0Jr5Aii38WarWFQETpqyQBJj6agb 086HVygwl2DetotZn5ebGDOryIIOPgSHSuoQZtW+jTvrsZthadP4d8NZc/fRGqfu7+0gTeVXc IQMprsOVXjN7b3bHLrAXyraKVmTFc9Z3PhVh7BtZGMnzTwPmnFqo+qqUdLLa41QyzfsqxYLF0 hWazSbv3ynZ5j3wp3+2+gTwvzhA2rE66dTw5DQvRohRGEz6aXUNDCY6pjADCUqa8lYBNemELb PNs2Dxy+3/ns3IG+sX+it1LHGEBNUi6SrLl7+VgdckDgPiluROkok2TGDJTx1ZVByHo0HbHr5 TK0T4SxT6PX4QFxnVl/3jj9wOIhBttOco4DRMtEQf6Cyb9pE36lFN7BrYggYw9XJDg/laYIWo p2L2c2rea5O4KzUIxCd8oryTHMXSi/9bEE2XD8hM2e7AfS1yzd9squvqOxqxXjSDnj6aXax0v AvER8TczYFf0GaLi2Rguh1l47JVmaFgBcKFtDQ== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When CDROM is enabled, but nothing else selects BLK_SCSI_REQUEST, we get this link error: cdrom.c:(.text+0x7a18): undefined reference to `scsi_cmd_blk_ioctl' The problem is that the CDROM helper code has become user-selectable now when it used to only be compiled if anything else enabled it. This moves the 'select BLK_SCSI_REQUEST' from the drivers that explicitly have it into CONFIG_CDROM, to make sure we always build that code. Fixes: 2a750166a5be ("block: Rework drivers/cdrom/Makefile") Signed-off-by: Arnd Bergmann --- drivers/block/Kconfig | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) -- 2.9.0 diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig index e84432df1a55..b8d9fcbe4020 100644 --- a/drivers/block/Kconfig +++ b/drivers/block/Kconfig @@ -69,7 +69,8 @@ config AMIGA_Z2RAM module will be called z2ram. config CDROM - tristate "CD-ROM driver" + tristate + select BLK_SCSI_REQUEST help A CD-ROM is a pre-pressed optical compact disc which contains data. The name is an acronym which stands for "Compact Disc @@ -82,7 +83,6 @@ config GDROM tristate "SEGA Dreamcast GD-ROM drive" depends on SH_DREAMCAST select CDROM - select BLK_SCSI_REQUEST # only for the generic cdrom code help A standard SEGA Dreamcast comes with a modified CD ROM drive called a "GD-ROM" by SEGA to signify it is capable of reading special disks @@ -360,7 +360,6 @@ config CDROM_PKTCDVD tristate "Packet writing on CD/DVD media (DEPRECATED)" depends on !UML select CDROM - select BLK_SCSI_REQUEST help Note: This driver is deprecated and will be removed from the kernel in the near future!