cleanup asm/scatterlist.h includes

Not architecture specific code should not #include <asm/scatterlist.h>. This patch therefore either replaces them with #include <linux/scatterlist.h> or simply removes them if they were unused. Signed-off-by: Adrian Bunk <bunk@kernel.org> Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
2007-10-30 10:35:04 +01:00 · 2007-10-30 10:35:04 +01:00 · 87ae9afdca
--- a/crypto/anubis.c
+++ b/crypto/anubis.c
@ -33,7 +33,6 @@
 #include <linux/module.h>
 #include <linux/mm.h>
 #include <asm/byteorder.h>
-#include <asm/scatterlist.h>
 #include <linux/crypto.h>
 #include <linux/types.h>

--- a/crypto/blowfish.c
+++ b/crypto/blowfish.c
@ -20,7 +20,6 @@
 #include <linux/module.h>
 #include <linux/mm.h>
 #include <asm/byteorder.h>
-#include <asm/scatterlist.h>
 #include <linux/crypto.h>
 #include <linux/types.h>

--- a/crypto/compress.c
+++ b/crypto/compress.c
@ -14,7 +14,6 @@
 #include <linux/types.h>
 #include <linux/crypto.h>
 #include <linux/errno.h>
-#include <asm/scatterlist.h>
 #include <linux/string.h>
 #include "internal.h"

--- a/crypto/crypto_null.c
+++ b/crypto/crypto_null.c
@ -19,7 +19,6 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/mm.h>
-#include <asm/scatterlist.h>
 #include <linux/crypto.h>
 #include <linux/string.h>

--- a/crypto/khazad.c
+++ b/crypto/khazad.c
@ -23,7 +23,6 @@
 #include <linux/module.h>
 #include <linux/mm.h>
 #include <asm/byteorder.h>
-#include <asm/scatterlist.h>
 #include <linux/crypto.h>
 #include <linux/types.h>

--- a/crypto/sha1_generic.c
+++ b/crypto/sha1_generic.c
@ -23,7 +23,6 @@
 #include <linux/cryptohash.h>
 #include <linux/types.h>
 #include <crypto/sha.h>
-#include <asm/scatterlist.h>
 #include <asm/byteorder.h>

 struct sha1_ctx {
--- a/crypto/sha256_generic.c
+++ b/crypto/sha256_generic.c
@ -22,7 +22,6 @@
 #include <linux/crypto.h>
 #include <linux/types.h>
 #include <crypto/sha.h>
-#include <asm/scatterlist.h>
 #include <asm/byteorder.h>

 struct sha256_ctx {
--- a/crypto/sha512.c
+++ b/crypto/sha512.c
@ -19,7 +19,6 @@
 #include <linux/types.h>
 #include <crypto/sha.h>

-#include <asm/scatterlist.h>
 #include <asm/byteorder.h>

 struct sha512_ctx {
--- a/crypto/tea.c
+++ b/crypto/tea.c
@ -23,7 +23,6 @@
 #include <linux/module.h>
 #include <linux/mm.h>
 #include <asm/byteorder.h>
-#include <asm/scatterlist.h>
 #include <linux/crypto.h>
 #include <linux/types.h>

--- a/crypto/tgr192.c
+++ b/crypto/tgr192.c
@ -25,7 +25,6 @@
 #include <linux/module.h>
 #include <linux/mm.h>
 #include <asm/byteorder.h>
-#include <asm/scatterlist.h>
 #include <linux/crypto.h>
 #include <linux/types.h>

--- a/crypto/wp512.c
+++ b/crypto/wp512.c
@ -23,7 +23,6 @@
 #include <linux/module.h>
 #include <linux/mm.h>
 #include <asm/byteorder.h>
-#include <asm/scatterlist.h>
 #include <linux/crypto.h>
 #include <linux/types.h>

--- a/drivers/base/dmapool.c
+++ b/drivers/base/dmapool.c
@ -2,7 +2,6 @@
 #include <linux/device.h>
 #include <linux/mm.h>
 #include <asm/io.h>		/* Needed for i386 to build */
-#include <asm/scatterlist.h>	/* Needed for i386 to build */
 #include <linux/dma-mapping.h>
 #include <linux/dmapool.h>
 #include <linux/slab.h>
--- a/drivers/ieee1394/sbp2.c
+++ b/drivers/ieee1394/sbp2.c
@ -71,11 +71,11 @@
 #include <linux/types.h>
 #include <linux/wait.h>
 #include <linux/workqueue.h>
+#include <linux/scatterlist.h>

 #include <asm/byteorder.h>
 #include <asm/errno.h>
 #include <asm/param.h>
-#include <asm/scatterlist.h>
 #include <asm/system.h>
 #include <asm/types.h>

--- a/drivers/media/video/bt8xx/bttvp.h
+++ b/drivers/media/video/bt8xx/bttvp.h
@ -36,7 +36,7 @@
 #include <linux/pci.h>
 #include <linux/input.h>
 #include <linux/mutex.h>
-#include <asm/scatterlist.h>
+#include <linux/scatterlist.h>
 #include <asm/io.h>
 #include <media/v4l2-common.h>

--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@ -19,7 +19,6 @@
 #include <linux/pagemap.h>
 #include <linux/err.h>
 #include <linux/leds.h>
-#include <asm/scatterlist.h>
 #include <linux/scatterlist.h>

 #include <linux/mmc/card.h>
--- a/drivers/mmc/core/mmc_ops.c
+++ b/drivers/mmc/core/mmc_ops.c
@ -10,7 +10,6 @@
 */

 #include <linux/types.h>
-#include <asm/scatterlist.h>
 #include <linux/scatterlist.h>

 #include <linux/mmc/host.h>
--- a/drivers/mmc/core/sd_ops.c
+++ b/drivers/mmc/core/sd_ops.c
@ -10,7 +10,6 @@
 */

 #include <linux/types.h>
-#include <asm/scatterlist.h>
 #include <linux/scatterlist.h>

 #include <linux/mmc/host.h>
--- a/drivers/mmc/core/sdio_ops.c
+++ b/drivers/mmc/core/sdio_ops.c
@ -9,7 +9,6 @@
 * your option) any later version.
 */

-#include <asm/scatterlist.h>
 #include <linux/scatterlist.h>

 #include <linux/mmc/host.h>
--- a/drivers/net/meth.c
+++ b/drivers/net/meth.c
@ -33,7 +33,6 @@
 #include <asm/ip32/ip32_ints.h>

 #include <asm/io.h>
-#include <asm/scatterlist.h>

 #include "meth.h"

--- a/drivers/usb/core/buffer.c
+++ b/drivers/usb/core/buffer.c
@ -11,7 +11,6 @@
 #include <linux/device.h>
 #include <linux/mm.h>
 #include <asm/io.h>
-#include <asm/scatterlist.h>
 #include <linux/dma-mapping.h>
 #include <linux/dmapool.h>
 #include <linux/usb.h>
--- a/drivers/usb/core/hcd.c
+++ b/drivers/usb/core/hcd.c
@ -30,7 +30,6 @@
 #include <linux/utsname.h>
 #include <linux/mm.h>
 #include <asm/io.h>
-#include <asm/scatterlist.h>
 #include <linux/device.h>
 #include <linux/dma-mapping.h>
 #include <linux/mutex.h>
--- a/drivers/usb/core/usb.c
+++ b/drivers/usb/core/usb.c
@ -36,7 +36,7 @@
 #include <linux/workqueue.h>

 #include <asm/io.h>
-#include <asm/scatterlist.h>
+#include <linux/scatterlist.h>
 #include <linux/mm.h>
 #include <linux/dma-mapping.h>

--- a/fs/nfsd/nfs4recover.c
+++ b/fs/nfsd/nfs4recover.c
@ -43,7 +43,7 @@
 #include <linux/file.h>
 #include <linux/namei.h>
 #include <asm/uaccess.h>
-#include <asm/scatterlist.h>
+#include <linux/scatterlist.h>
 #include <linux/crypto.h>
 #include <linux/sched.h>

--- a/include/net/esp.h
+++ b/include/net/esp.h
@ -3,7 +3,7 @@

 #include <linux/crypto.h>
 #include <net/xfrm.h>
-#include <asm/scatterlist.h>
+#include <linux/scatterlist.h>

 #define ESP_NUM_FAST_SG		4

--- a/include/rdma/ib_verbs.h
+++ b/include/rdma/ib_verbs.h
@ -48,9 +48,9 @@
 #include <linux/kref.h>
 #include <linux/list.h>
 #include <linux/rwsem.h>
+#include <linux/scatterlist.h>

 #include <asm/atomic.h>
-#include <asm/scatterlist.h>
 #include <asm/uaccess.h>

 union ib_gid {
--- a/include/scsi/libsas.h
+++ b/include/scsi/libsas.h
@ -36,7 +36,7 @@
 #include <scsi/scsi_device.h>
 #include <scsi/scsi_cmnd.h>
 #include <scsi/scsi_transport_sas.h>
-#include <asm/scatterlist.h>
+#include <linux/scatterlist.h>

 struct block_device;

--- a/net/ieee80211/ieee80211_crypt_ccmp.c
+++ b/net/ieee80211/ieee80211_crypt_ccmp.c
@ -25,7 +25,6 @@
 #include <net/ieee80211.h>

 #include <linux/crypto.h>
-#include <asm/scatterlist.h>

 MODULE_AUTHOR("Jouni Malinen");
 MODULE_DESCRIPTION("Host AP crypt: CCMP");
--- a/net/ipv4/ah4.c
+++ b/net/ipv4/ah4.c
@ -8,7 +8,6 @@
 #include <linux/spinlock.h>
 #include <net/icmp.h>
 #include <net/protocol.h>
-#include <asm/scatterlist.h>


 /* Clear mutable options and find final destination to substitute
--- a/net/ipv4/ipcomp.c
+++ b/net/ipv4/ipcomp.c
@ -14,7 +14,6 @@
 *   - Adaptive compression.
 */
 #include <linux/module.h>
-#include <asm/scatterlist.h>
 #include <asm/semaphore.h>
 #include <linux/crypto.h>
 #include <linux/pfkeyv2.h>
--- a/net/ipv6/ah6.c
+++ b/net/ipv6/ah6.c
@ -35,7 +35,6 @@
 #include <net/ipv6.h>
 #include <net/protocol.h>
 #include <net/xfrm.h>
-#include <asm/scatterlist.h>

 static int zero_out_mutable_opts(struct ipv6_opt_hdr *opthdr)
 {
--- a/net/ipv6/ipcomp6.c
+++ b/net/ipv6/ipcomp6.c
@ -34,7 +34,6 @@
 #include <net/ip.h>
 #include <net/xfrm.h>
 #include <net/ipcomp.h>
-#include <asm/scatterlist.h>
 #include <asm/semaphore.h>
 #include <linux/crypto.h>
 #include <linux/pfkeyv2.h>
--- a/net/mac80211/aes_ccm.c
+++ b/net/mac80211/aes_ccm.c
@ -11,7 +11,6 @@
 #include <linux/types.h>
 #include <linux/crypto.h>
 #include <linux/err.h>
-#include <asm/scatterlist.h>

 #include <net/mac80211.h>
 #include "ieee80211_key.h"
--- a/net/sunrpc/auth_gss/gss_krb5_seal.c
+++ b/net/sunrpc/auth_gss/gss_krb5_seal.c
@ -63,7 +63,6 @@
 #include <linux/jiffies.h>
 #include <linux/sunrpc/gss_krb5.h>
 #include <linux/random.h>
-#include <asm/scatterlist.h>
 #include <linux/crypto.h>

 #ifdef RPC_DEBUG
--- a/net/sunrpc/auth_gss/gss_krb5_wrap.c
+++ b/net/sunrpc/auth_gss/gss_krb5_wrap.c
@ -4,7 +4,6 @@
 #include <linux/sunrpc/gss_krb5.h>
 #include <linux/random.h>
 #include <linux/pagemap.h>
-#include <asm/scatterlist.h>
 #include <linux/crypto.h>

 #ifdef RPC_DEBUG
--- a/net/xfrm/xfrm_algo.c
+++ b/net/xfrm/xfrm_algo.c
@ -21,7 +21,6 @@
 #if defined(CONFIG_INET_ESP) || defined(CONFIG_INET_ESP_MODULE) || defined(CONFIG_INET6_ESP) || defined(CONFIG_INET6_ESP_MODULE)
 #include <net/esp.h>
 #endif
-#include <asm/scatterlist.h>

 /*
 * Algorithms supported by IPsec.  These entries contain properties which