From b95fb1f9d782e669254703627195aafe776f59d2 Mon Sep 17 00:00:00 2001
From: Vladislav Bolkhovitin <vst@vlnb.net>
Date: Tue, 27 May 2008 14:28:37 +0000
Subject: [PATCH] Patch from Bart Van Assche <bart.vanassche@gmail.com>:

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 <bart.vanassche@gmail.com>



git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@399 d57e44dd-8a1f-0410-8b47-8ef2f437770f
---
 iscsi-scst/kernel/digest.c         | 2 +-
 scst/include/scst_debug.h          | 2 +-
 scst/src/dev_handlers/scst_vdisk.c | 2 +-
 scst/src/scst_lib.c                | 4 ++--
 scst/src/scst_main.c               | 4 ++--
 scst/src/scst_mem.c                | 4 ++--
 scst/src/scst_mem.h                | 2 +-
 scst/src/scst_proc.c               | 6 +++---
 scst/src/scst_targ.c               | 4 ++--
 9 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/iscsi-scst/kernel/digest.c b/iscsi-scst/kernel/digest.c
index 131ee39da..403748ead 100644
--- a/iscsi-scst/kernel/digest.c
+++ b/iscsi-scst/kernel/digest.c
@@ -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"
diff --git a/scst/include/scst_debug.h b/scst/include/scst_debug.h
index 4d4fa48a2..a84b24548 100644
--- a/scst/include/scst_debug.h
+++ b/scst/include/scst_debug.h
@@ -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
diff --git a/scst/src/dev_handlers/scst_vdisk.c b/scst/src/dev_handlers/scst_vdisk.c
index b5085dcdd..9463ab84b 100644
--- a/scst/src/dev_handlers/scst_vdisk.c
+++ b/scst/src/dev_handlers/scst_vdisk.c
@@ -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>
diff --git a/scst/src/scst_lib.c b/scst/src/scst_lib.c
index bff136094..2629e17f1 100644
--- a/scst/src/scst_lib.c
+++ b/scst/src/scst_lib.c
@@ -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>
diff --git a/scst/src/scst_main.c b/scst/src/scst_main.c
index bdf29b277..b4589b97e 100644
--- a/scst/src/scst_main.c
+++ b/scst/src/scst_main.c
@@ -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"
diff --git a/scst/src/scst_mem.c b/scst/src/scst_mem.c
index 0da172782..e36fbf54d 100644
--- a/scst/src/scst_mem.c
+++ b/scst/src/scst_mem.c
@@ -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>
diff --git a/scst/src/scst_mem.h b/scst/src/scst_mem.h
index 308384ffb..d32e8aae4 100644
--- a/scst/src/scst_mem.h
+++ b/scst/src/scst_mem.h
@@ -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>
 
diff --git a/scst/src/scst_proc.c b/scst/src/scst_proc.c
index 4d07ac172..01d6139ef 100644
--- a/scst/src/scst_proc.c
+++ b/scst/src/scst_proc.c
@@ -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>
 
diff --git a/scst/src/scst_targ.c b/scst/src/scst_targ.c
index 6ef94df21..9530ae155 100644
--- a/scst/src/scst_targ.c
+++ b/scst/src/scst_targ.c
@@ -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>