[2.6 patch] fix CCISS with PROC_FS=n

[2.6 patch] fix CCISS with PROC_FS=n

[Adrian Bunk]

I got the following compile error in 2.6.8-rc3-mm2 with 
CONFIG_PROC_FS=n:

<--  snip  -->

...
  LD      .tmp_vmlinux1
drivers/built-in.o(.text+0x1b221c): In function `do_cciss_intr':
: undefined reference to `complete_scsi_command'
drivers/built-in.o(.text+0x1b2d18): In function `cciss_init_one':
: undefined reference to `cciss_scsi_setup'
drivers/built-in.o(.text+0x1b2fd3): In function `cciss_remove_one':
: undefined reference to `cciss_unregister_scsi'
make: *** [.tmp_vmlinux1] Error 1

<--  snip  -->


The following patch fixes this issue:


Signed-off-by: Adrian Bunk <bunk@fs.tum.de>

--- linux-2.6.8-rc3-mm2-full/drivers/block/cciss.c.old	2004-08-09 17:26:58.000000000 +0200
+++ linux-2.6.8-rc3-mm2-full/drivers/block/cciss.c	2004-08-09 17:27:14.000000000 +0200
@@ -185,10 +185,11 @@
         }
         return c;
 }
-#ifdef CONFIG_PROC_FS
 
 #include "cciss_scsi.c"		/* For SCSI tape support */
 
+#ifdef CONFIG_PROC_FS
+
 /*
  * Report information about this controller.
  */

Re: [2.6 patch] fix CCISS with PROC_FS=n

[mikem]

On Mon, Aug 09, 2004 at 05:34:46PM +0200, Adrian Bunk wrote:
> I got the following compile error in 2.6.8-rc3-mm2 with 
> CONFIG_PROC_FS=n:
> 
> <--  snip  -->
> 
> ...
>   LD      .tmp_vmlinux1
> drivers/built-in.o(.text+0x1b221c): In function `do_cciss_intr':
> : undefined reference to `complete_scsi_command'
> drivers/built-in.o(.text+0x1b2d18): In function `cciss_init_one':
> : undefined reference to `cciss_scsi_setup'
> drivers/built-in.o(.text+0x1b2fd3): In function `cciss_remove_one':
> : undefined reference to `cciss_unregister_scsi'
> make: *** [.tmp_vmlinux1] Error 1
> 
> <--  snip  -->
> 
> 
> The following patch fixes this issue:
> 
> 
> Signed-off-by: Adrian Bunk <bunk@fs.tum.de>
> 
> --- linux-2.6.8-rc3-mm2-full/drivers/block/cciss.c.old	2004-08-09 17:26:58.000000000 +0200
> +++ linux-2.6.8-rc3-mm2-full/drivers/block/cciss.c	2004-08-09 17:27:14.000000000 +0200
> @@ -185,10 +185,11 @@
>          }
>          return c;
>  }
> -#ifdef CONFIG_PROC_FS
>  
>  #include "cciss_scsi.c"		/* For SCSI tape support */

We use /proc to hook into the SCSI subsystem. If you do not build /proc support
into your kernel then you should also disable tape support in the driver. 

Thanks,
mikem
>  
> +#ifdef CONFIG_PROC_FS
> +
>  /*
>   * Report information about this controller.
>   */
> 

Re: [2.6 patch] fix CCISS with PROC_FS=n

[Adrian Bunk]

On Mon, Aug 09, 2004 at 11:07:43AM -0500, mikem wrote:
>...
> > -#ifdef CONFIG_PROC_FS
> >  
> >  #include "cciss_scsi.c"		/* For SCSI tape support */
> 
> We use /proc to hook into the SCSI subsystem. If you do not build /proc support
> into your kernel then you should also disable tape support in the driver. 
>...


Thanks for this informaition. Better patch below.


Signed-off-by: Adrian Bunk <bunk@fs.tum.de>

--- linux-2.6.8-rc3-mm2-full/drivers/block/Kconfig.old	2004-08-09 20:57:36.000000000 +0200
+++ linux-2.6.8-rc3-mm2-full/drivers/block/Kconfig	2004-08-09 20:57:56.000000000 +0200
@@ -166,7 +166,7 @@
 
 config CISS_SCSI_TAPE
 	bool "SCSI tape drive support for Smart Array 5xxx"
-	depends on BLK_CPQ_CISS_DA && SCSI
+	depends on BLK_CPQ_CISS_DA && SCSI && PROC_FS
 	help
 	  When enabled (Y), this option allows SCSI tape drives and SCSI medium
 	  changers (tape robots) to be accessed via a Compaq 5xxx array