Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966545AbXEGUZg (ORCPT ); Mon, 7 May 2007 16:25:36 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S966536AbXEGUZb (ORCPT ); Mon, 7 May 2007 16:25:31 -0400 Received: from [198.99.130.12] ([198.99.130.12]:60203 "EHLO saraswathi.solana.com" rhost-flags-FAIL-FAIL-OK-OK) by vger.kernel.org with ESMTP id S966535AbXEGUZ3 (ORCPT ); Mon, 7 May 2007 16:25:29 -0400 Date: Mon, 7 May 2007 16:20:18 -0400 From: Jeff Dike To: Andrew Morton Cc: Peter Zijlstra , LKML , uml-devel Subject: [PATCH 2/5] UML - Turn on SCSI support Message-ID: <20070507202018.GA8508@c2.user-mode-linux.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.4.2.2i Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2863 Lines: 107 From: Peter Zijlstra Enable (i)SCSI on UML, dunno why SCSI was deemed broken, it works like a charm. Signed-off-by: Peter Zijlstra Signed-off-by: Jeff Dike -- arch/um/Kconfig | 16 -------------- arch/um/Kconfig.scsi | 58 --------------------------------------------------- 2 files changed, 1 insertion(+), 73 deletions(-) Index: linux-2.6.21-mm/arch/um/Kconfig =================================================================== --- linux-2.6.21-mm.orig/arch/um/Kconfig 2007-05-02 11:33:20.000000000 -0400 +++ linux-2.6.21-mm/arch/um/Kconfig 2007-05-04 13:42:07.000000000 -0400 @@ -320,21 +320,7 @@ source "crypto/Kconfig" source "lib/Kconfig" -menu "SCSI support" -depends on BROKEN - -config SCSI - tristate "SCSI support" - -# This gives us free_dma, which scsi.c wants. -config GENERIC_ISA_DMA - bool - depends on SCSI - default y - -source "arch/um/Kconfig.scsi" - -endmenu +source "drivers/scsi/Kconfig" source "drivers/md/Kconfig" Index: linux-2.6.21-mm/arch/um/Kconfig.scsi =================================================================== --- linux-2.6.21-mm.orig/arch/um/Kconfig.scsi 2007-02-04 13:44:54.000000000 -0500 +++ /dev/null 1970-01-01 00:00:00.000000000 +0000 @@ -1,58 +0,0 @@ -comment "SCSI support type (disk, tape, CD-ROM)" - depends on SCSI - -config BLK_DEV_SD - tristate "SCSI disk support" - depends on SCSI - -config SD_EXTRA_DEVS - int "Maximum number of SCSI disks that can be loaded as modules" - depends on BLK_DEV_SD - default "40" - -config CHR_DEV_ST - tristate "SCSI tape support" - depends on SCSI - -config BLK_DEV_SR - tristate "SCSI CD-ROM support" - depends on SCSI - -config BLK_DEV_SR_VENDOR - bool "Enable vendor-specific extensions (for SCSI CDROM)" - depends on BLK_DEV_SR - -config SR_EXTRA_DEVS - int "Maximum number of CDROM devices that can be loaded as modules" - depends on BLK_DEV_SR - default "2" - -config CHR_DEV_SG - tristate "SCSI generic support" - depends on SCSI - -comment "Some SCSI devices (e.g. CD jukebox) support multiple LUNs" - depends on SCSI - -#if [ "$CONFIG_EXPERIMENTAL" = "y" ]; then -config SCSI_DEBUG_QUEUES - bool "Enable extra checks in new queueing code" - depends on SCSI - -#fi -config SCSI_MULTI_LUN - bool "Probe all LUNs on each SCSI device" - depends on SCSI - -config SCSI_CONSTANTS - bool "Verbose SCSI error reporting (kernel size +=12K)" - depends on SCSI - -config SCSI_LOGGING - bool "SCSI logging facility" - depends on SCSI - -config SCSI_DEBUG - tristate "SCSI debugging host simulator (EXPERIMENTAL)" - depends on SCSI - - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/