[Scst-svn] SF.net SVN: scst: [399] trunk

[<vl...@us...>]

Revision: 399
          http://scst.svn.sourceforge.net/scst/?rev=399&view=rev
Author:   vlnb
Date:     2008-05-27 07:28:37 -0700 (Tue, 27 May 2008)

Log Message:
-----------
Patch from Bart Van Assche <bar...@gm...>:

The patch below fixes the following checkpatch warning:
WARNING: Use #include <linux/...> instead of <asm/...>

This patch has been tested as follows:
- Verified the patch by rereading it.
- Checked that make -s clean && make -s iscsi scst && make -s -C srpt still
  works.
- Checked that the patch generated by generate-kernel-patch still applies
  cleanly to the 2.6.25.4 kernel, and that the patched kernel tree still
  compiles, installs and boots fine, and that the iscsi-scst, ib_srpt,
  scst_disk and scst_vdisk modules still load.

Signed-off-by: Bart Van Assche <bar...@gm...>

Modified Paths:
--------------
    trunk/iscsi-scst/kernel/digest.c
    trunk/scst/include/scst_debug.h
    trunk/scst/src/dev_handlers/scst_vdisk.c
    trunk/scst/src/scst_lib.c
    trunk/scst/src/scst_main.c
    trunk/scst/src/scst_mem.c
    trunk/scst/src/scst_mem.h
    trunk/scst/src/scst_proc.c
    trunk/scst/src/scst_targ.c

Modified: trunk/iscsi-scst/kernel/digest.c
===================================================================
--- trunk/iscsi-scst/kernel/digest.c	2008-05-27 14:26:15 UTC (rev 398)
+++ trunk/iscsi-scst/kernel/digest.c	2008-05-27 14:28:37 UTC (rev 399)
@@ -15,7 +15,7 @@
  *  GNU General Public License for more details.
  */
 
-#include <asm/types.h>
+#include <linux/types.h>
 #include <linux/scatterlist.h>
 
 #include "iscsi.h"

Modified: trunk/scst/include/scst_debug.h
===================================================================
--- trunk/scst/include/scst_debug.h	2008-05-27 14:26:15 UTC (rev 398)
+++ trunk/scst/include/scst_debug.h	2008-05-27 14:28:37 UTC (rev 399)
@@ -21,7 +21,7 @@
 #define __SCST_DEBUG_H
 
 #include <linux/autoconf.h>	/* for CONFIG_* */
-#include <asm/bug.h>		/* for WARN_ON_ONCE */
+#include <linux/bug.h>		/* for WARN_ON_ONCE */
 
 #if !defined(EXTRACHECKS) && defined(CONFIG_SCSI_TARGET_EXTRACHECKS)
 #define EXTRACHECKS

Modified: trunk/scst/src/dev_handlers/scst_vdisk.c
===================================================================
--- trunk/scst/src/dev_handlers/scst_vdisk.c	2008-05-27 14:26:15 UTC (rev 398)
+++ trunk/scst/src/dev_handlers/scst_vdisk.c	2008-05-27 14:28:37 UTC (rev 399)
@@ -20,7 +20,7 @@
  *  GNU General Public License for more details.
  */
 
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 #include <linux/file.h>
 #include <linux/fs.h>
 #include <linux/string.h>

Modified: trunk/scst/src/scst_lib.c
===================================================================
--- trunk/scst/src/scst_lib.c	2008-05-27 14:26:15 UTC (rev 398)
+++ trunk/scst/src/scst_lib.c	2008-05-27 14:28:37 UTC (rev 399)
@@ -24,8 +24,8 @@
 #include <linux/sched.h>
 #include <linux/kthread.h>
 #include <linux/cdrom.h>
-#include <asm/unistd.h>
-#include <asm/string.h>
+#include <linux/unistd.h>
+#include <linux/string.h>
 
 #ifdef SCST_HIGHMEM
 #include <linux/highmem.h>

Modified: trunk/scst/src/scst_main.c
===================================================================
--- trunk/scst/src/scst_main.c	2008-05-27 14:26:15 UTC (rev 398)
+++ trunk/scst/src/scst_main.c	2008-05-27 14:28:37 UTC (rev 399)
@@ -24,8 +24,8 @@
 #include <linux/spinlock.h>
 #include <linux/slab.h>
 #include <linux/sched.h>
-#include <asm/unistd.h>
-#include <asm/string.h>
+#include <linux/unistd.h>
+#include <linux/string.h>
 #include <linux/kthread.h>
 
 #include "scst.h"

Modified: trunk/scst/src/scst_mem.c
===================================================================
--- trunk/scst/src/scst_mem.c	2008-05-27 14:26:15 UTC (rev 398)
+++ trunk/scst/src/scst_mem.c	2008-05-27 14:28:37 UTC (rev 399)
@@ -24,8 +24,8 @@
 #include <linux/slab.h>
 #include <linux/sched.h>
 #include <linux/mm.h>
-#include <asm/unistd.h>
-#include <asm/string.h>
+#include <linux/unistd.h>
+#include <linux/string.h>
 
 #ifdef SCST_HIGHMEM
 #include <linux/highmem.h>

Modified: trunk/scst/src/scst_mem.h
===================================================================
--- trunk/scst/src/scst_mem.h	2008-05-27 14:26:15 UTC (rev 398)
+++ trunk/scst/src/scst_mem.h	2008-05-27 14:28:37 UTC (rev 399)
@@ -14,7 +14,7 @@
  *  GNU General Public License for more details.
  */
 
-#include <asm/scatterlist.h>
+#include <linux/scatterlist.h>
 #include <linux/workqueue.h>
 #include <linux/seq_file.h>
 

Modified: trunk/scst/src/scst_proc.c
===================================================================
--- trunk/scst/src/scst_proc.c	2008-05-27 14:26:15 UTC (rev 398)
+++ trunk/scst/src/scst_proc.c	2008-05-27 14:28:37 UTC (rev 399)
@@ -24,9 +24,9 @@
 #include <linux/spinlock.h>
 #include <linux/slab.h>
 #include <linux/sched.h>
-#include <asm/unistd.h>
-#include <asm/string.h>
-#include <asm/uaccess.h>
+#include <linux/unistd.h>
+#include <linux/string.h>
+#include <linux/uaccess.h>
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 

Modified: trunk/scst/src/scst_targ.c
===================================================================
--- trunk/scst/src/scst_targ.c	2008-05-27 14:26:15 UTC (rev 398)
+++ trunk/scst/src/scst_targ.c	2008-05-27 14:28:37 UTC (rev 399)
@@ -23,8 +23,8 @@
 #include <linux/slab.h>
 #include <linux/sched.h>
 #include <linux/smp_lock.h>
-#include <asm/unistd.h>
-#include <asm/string.h>
+#include <linux/unistd.h>
+#include <linux/string.h>
 #include <linux/kthread.h>
 #include <linux/delay.h>
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.