[2.6 patch] fix block/cciss.c with PROC_FS=n

[2.6 patch] fix block/cciss.c with PROC_FS=n

[Adrian Bunk]

I got the following compile error in both 2.6.9-rc4 and 2.6.9-rc4-mm1 
when compiling with CONFIG_PROC_FS=n:


<--  snip  -->

...
  LD      .tmp_vmlinux1
kernel/built-in.o(.text+0x1d42b): In function `crash_create_proc_entry':
: undefined reference to `proc_vmcore'
drivers/built-in.o(.text+0x234eb8): In function `cciss_init_one':
: undefined reference to `cciss_scsi_setup'
drivers/built-in.o(.text+0x235173): In function `cciss_remove_one':
: undefined reference to `cciss_unregister_scsi'
make: *** [.tmp_vmlinux1] Error 1

<--  snip  -->


The patch below fixes this issue.


I don't know whether this might qualify it for 2.6.9:
- it fixes the only CONFIG_PROC_FS=n compile error I found in 2.6.9-rc4
- it has obviously no effect in the CONFIG_PROC_FS=y case


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

--- linux-2.6.9-rc4-mm1-full/drivers/block/cciss.c.old	2004-10-12 20:36:33.000000000 +0200
+++ linux-2.6.9-rc4-mm1-full/drivers/block/cciss.c	2004-10-12 20:37:16.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 block/cciss.c with PROC_FS=n

[Miller, Mike (OS Dev)]

> -----Original Message-----
> From: Adrian Bunk [mailto:bunk@stusta.de]
> 
> I got the following compile error in both 2.6.9-rc4 and 2.6.9-rc4-mm1 
> when compiling with CONFIG_PROC_FS=n:
> 
> 
> <--  snip  -->
> 
> ...
>   LD      .tmp_vmlinux1
> kernel/built-in.o(.text+0x1d42b): In function 
> `crash_create_proc_entry':
> : undefined reference to `proc_vmcore'
> drivers/built-in.o(.text+0x234eb8): In function `cciss_init_one':
> : undefined reference to `cciss_scsi_setup'
> drivers/built-in.o(.text+0x235173): In function `cciss_remove_one':
> : undefined reference to `cciss_unregister_scsi'
> make: *** [.tmp_vmlinux1] Error 1
> 
> <--  snip  -->
> 
> 
> The patch below fixes this issue.
> 
> 
> I don't know whether this might qualify it for 2.6.9:
> - it fixes the only CONFIG_PROC_FS=n compile error I found in 
> 2.6.9-rc4
> - it has obviously no effect in the CONFIG_PROC_FS=y case
> 
> 
> Signed-off-by: Adrian Bunk <bunk@stusta.de>
> 
> --- linux-2.6.9-rc4-mm1-full/drivers/block/cciss.c.old	
> 2004-10-12 20:36:33.000000000 +0200
> +++ linux-2.6.9-rc4-mm1-full/drivers/block/cciss.c	
> 2004-10-12 20:37:16.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.
>   */

This looks OK.

mikem

>