Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 87ae9afdcada236d0a1b38ce2c465a65916961dc

Authored by Adrian Bunk
Committed by Jens Axboe
1 parent 013fb33972
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

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>

Showing 35 changed files with 7 additions and 35 deletions Side-by-side Diff

... ... @@ -33,7 +33,6 @@
33 33 #include <linux/module.h>
34 34 #include <linux/mm.h>
35 35 #include <asm/byteorder.h>
36   -#include <asm/scatterlist.h>
37 36 #include <linux/crypto.h>
38 37 #include <linux/types.h>
39 38  
... ... @@ -20,7 +20,6 @@
20 20 #include <linux/module.h>
21 21 #include <linux/mm.h>
22 22 #include <asm/byteorder.h>
23   -#include <asm/scatterlist.h>
24 23 #include <linux/crypto.h>
25 24 #include <linux/types.h>
26 25  
... ... @@ -14,7 +14,6 @@
14 14 #include <linux/types.h>
15 15 #include <linux/crypto.h>
16 16 #include <linux/errno.h>
17   -#include <asm/scatterlist.h>
18 17 #include <linux/string.h>
19 18 #include "internal.h"
20 19  
crypto/crypto_null.c
Diff comments   View file @ 87ae9af
... ... @@ -19,7 +19,6 @@
19 19 #include <linux/init.h>
20 20 #include <linux/module.h>
21 21 #include <linux/mm.h>
22   -#include <asm/scatterlist.h>
23 22 #include <linux/crypto.h>
24 23 #include <linux/string.h>
25 24  
... ... @@ -23,7 +23,6 @@
23 23 #include <linux/module.h>
24 24 #include <linux/mm.h>
25 25 #include <asm/byteorder.h>
26   -#include <asm/scatterlist.h>
27 26 #include <linux/crypto.h>
28 27 #include <linux/types.h>
29 28  
crypto/sha1_generic.c
Diff comments   View file @ 87ae9af
... ... @@ -23,7 +23,6 @@
23 23 #include <linux/cryptohash.h>
24 24 #include <linux/types.h>
25 25 #include <crypto/sha.h>
26   -#include <asm/scatterlist.h>
27 26 #include <asm/byteorder.h>
28 27  
29 28 struct sha1_ctx {
crypto/sha256_generic.c
Diff comments   View file @ 87ae9af
... ... @@ -22,7 +22,6 @@
22 22 #include <linux/crypto.h>
23 23 #include <linux/types.h>
24 24 #include <crypto/sha.h>
25   -#include <asm/scatterlist.h>
26 25 #include <asm/byteorder.h>
27 26  
28 27 struct sha256_ctx {
... ... @@ -19,7 +19,6 @@
19 19 #include <linux/types.h>
20 20 #include <crypto/sha.h>
21 21  
22   -#include <asm/scatterlist.h>
23 22 #include <asm/byteorder.h>
24 23  
25 24 struct sha512_ctx {
... ... @@ -23,7 +23,6 @@
23 23 #include <linux/module.h>
24 24 #include <linux/mm.h>
25 25 #include <asm/byteorder.h>
26   -#include <asm/scatterlist.h>
27 26 #include <linux/crypto.h>
28 27 #include <linux/types.h>
29 28  
... ... @@ -25,7 +25,6 @@
25 25 #include <linux/module.h>
26 26 #include <linux/mm.h>
27 27 #include <asm/byteorder.h>
28   -#include <asm/scatterlist.h>
29 28 #include <linux/crypto.h>
30 29 #include <linux/types.h>
31 30  
... ... @@ -23,7 +23,6 @@
23 23 #include <linux/module.h>
24 24 #include <linux/mm.h>
25 25 #include <asm/byteorder.h>
26   -#include <asm/scatterlist.h>
27 26 #include <linux/crypto.h>
28 27 #include <linux/types.h>
29 28  
drivers/base/dmapool.c
Diff comments   View file @ 87ae9af
... ... @@ -2,7 +2,6 @@
2 2 #include <linux/device.h>
3 3 #include <linux/mm.h>
4 4 #include <asm/io.h> /* Needed for i386 to build */
5   -#include <asm/scatterlist.h> /* Needed for i386 to build */
6 5 #include <linux/dma-mapping.h>
7 6 #include <linux/dmapool.h>
8 7 #include <linux/slab.h>
drivers/ieee1394/sbp2.c
Diff comments   View file @ 87ae9af
... ... @@ -71,11 +71,11 @@
71 71 #include <linux/types.h>
72 72 #include <linux/wait.h>
73 73 #include <linux/workqueue.h>
  74 +#include <linux/scatterlist.h>
74 75  
75 76 #include <asm/byteorder.h>
76 77 #include <asm/errno.h>
77 78 #include <asm/param.h>
78   -#include <asm/scatterlist.h>
79 79 #include <asm/system.h>
80 80 #include <asm/types.h>
81 81  
drivers/media/video/bt8xx/bttvp.h
Diff comments   View file @ 87ae9af
... ... @@ -36,7 +36,7 @@
36 36 #include <linux/pci.h>
37 37 #include <linux/input.h>
38 38 #include <linux/mutex.h>
39   -#include <asm/scatterlist.h>
  39 +#include <linux/scatterlist.h>
40 40 #include <asm/io.h>
41 41 #include <media/v4l2-common.h>
42 42  
drivers/mmc/core/core.c
Diff comments   View file @ 87ae9af
... ... @@ -19,7 +19,6 @@
19 19 #include <linux/pagemap.h>
20 20 #include <linux/err.h>
21 21 #include <linux/leds.h>
22   -#include <asm/scatterlist.h>
23 22 #include <linux/scatterlist.h>
24 23  
25 24 #include <linux/mmc/card.h>
drivers/mmc/core/mmc_ops.c
Diff comments   View file @ 87ae9af
... ... @@ -10,7 +10,6 @@
10 10 */
11 11  
12 12 #include <linux/types.h>
13   -#include <asm/scatterlist.h>
14 13 #include <linux/scatterlist.h>
15 14  
16 15 #include <linux/mmc/host.h>
drivers/mmc/core/sd_ops.c
Diff comments   View file @ 87ae9af
... ... @@ -10,7 +10,6 @@
10 10 */
11 11  
12 12 #include <linux/types.h>
13   -#include <asm/scatterlist.h>
14 13 #include <linux/scatterlist.h>
15 14  
16 15 #include <linux/mmc/host.h>
drivers/mmc/core/sdio_ops.c
Diff comments   View file @ 87ae9af
... ... @@ -9,7 +9,6 @@
9 9 * your option) any later version.
10 10 */
11 11  
12   -#include <asm/scatterlist.h>
13 12 #include <linux/scatterlist.h>
14 13  
15 14 #include <linux/mmc/host.h>
... ... @@ -33,7 +33,6 @@
33 33 #include <asm/ip32/ip32_ints.h>
34 34  
35 35 #include <asm/io.h>
36   -#include <asm/scatterlist.h>
37 36  
38 37 #include "meth.h"
39 38  
drivers/usb/core/buffer.c
Diff comments   View file @ 87ae9af
... ... @@ -11,7 +11,6 @@
11 11 #include <linux/device.h>
12 12 #include <linux/mm.h>
13 13 #include <asm/io.h>
14   -#include <asm/scatterlist.h>
15 14 #include <linux/dma-mapping.h>
16 15 #include <linux/dmapool.h>
17 16 #include <linux/usb.h>
drivers/usb/core/hcd.c
Diff comments   View file @ 87ae9af
... ... @@ -30,7 +30,6 @@
30 30 #include <linux/utsname.h>
31 31 #include <linux/mm.h>
32 32 #include <asm/io.h>
33   -#include <asm/scatterlist.h>
34 33 #include <linux/device.h>
35 34 #include <linux/dma-mapping.h>
36 35 #include <linux/mutex.h>
drivers/usb/core/usb.c
Diff comments   View file @ 87ae9af
... ... @@ -36,7 +36,7 @@
36 36 #include <linux/workqueue.h>
37 37  
38 38 #include <asm/io.h>
39   -#include <asm/scatterlist.h>
  39 +#include <linux/scatterlist.h>
40 40 #include <linux/mm.h>
41 41 #include <linux/dma-mapping.h>
42 42  
fs/nfsd/nfs4recover.c
Diff comments   View file @ 87ae9af
... ... @@ -43,7 +43,7 @@
43 43 #include <linux/file.h>
44 44 #include <linux/namei.h>
45 45 #include <asm/uaccess.h>
46   -#include <asm/scatterlist.h>
  46 +#include <linux/scatterlist.h>
47 47 #include <linux/crypto.h>
48 48 #include <linux/sched.h>
49 49  
... ... @@ -3,7 +3,7 @@
3 3  
4 4 #include <linux/crypto.h>
5 5 #include <net/xfrm.h>
6   -#include <asm/scatterlist.h>
  6 +#include <linux/scatterlist.h>
7 7  
8 8 #define ESP_NUM_FAST_SG 4
9 9  
include/rdma/ib_verbs.h
Diff comments   View file @ 87ae9af
... ... @@ -48,9 +48,9 @@
48 48 #include <linux/kref.h>
49 49 #include <linux/list.h>
50 50 #include <linux/rwsem.h>
  51 +#include <linux/scatterlist.h>
51 52  
52 53 #include <asm/atomic.h>
53   -#include <asm/scatterlist.h>
54 54 #include <asm/uaccess.h>
55 55  
56 56 union ib_gid {
include/scsi/libsas.h
Diff comments   View file @ 87ae9af
... ... @@ -36,7 +36,7 @@
36 36 #include <scsi/scsi_device.h>
37 37 #include <scsi/scsi_cmnd.h>
38 38 #include <scsi/scsi_transport_sas.h>
39   -#include <asm/scatterlist.h>
  39 +#include <linux/scatterlist.h>
40 40  
41 41 struct block_device;
42 42  
net/ieee80211/ieee80211_crypt_ccmp.c
Diff comments   View file @ 87ae9af
... ... @@ -25,7 +25,6 @@
25 25 #include <net/ieee80211.h>
26 26  
27 27 #include <linux/crypto.h>
28   -#include <asm/scatterlist.h>
29 28  
30 29 MODULE_AUTHOR("Jouni Malinen");
31 30 MODULE_DESCRIPTION("Host AP crypt: CCMP");
... ... @@ -8,7 +8,6 @@
8 8 #include <linux/spinlock.h>
9 9 #include <net/icmp.h>
10 10 #include <net/protocol.h>
11   -#include <asm/scatterlist.h>
12 11  
13 12  
14 13 /* Clear mutable options and find final destination to substitute
... ... @@ -14,7 +14,6 @@
14 14 * - Adaptive compression.
15 15 */
16 16 #include <linux/module.h>
17   -#include <asm/scatterlist.h>
18 17 #include <asm/semaphore.h>
19 18 #include <linux/crypto.h>
20 19 #include <linux/pfkeyv2.h>
... ... @@ -35,7 +35,6 @@
35 35 #include <net/ipv6.h>
36 36 #include <net/protocol.h>
37 37 #include <net/xfrm.h>
38   -#include <asm/scatterlist.h>
39 38  
40 39 static int zero_out_mutable_opts(struct ipv6_opt_hdr *opthdr)
41 40 {
... ... @@ -34,7 +34,6 @@
34 34 #include <net/ip.h>
35 35 #include <net/xfrm.h>
36 36 #include <net/ipcomp.h>
37   -#include <asm/scatterlist.h>
38 37 #include <asm/semaphore.h>
39 38 #include <linux/crypto.h>
40 39 #include <linux/pfkeyv2.h>
net/mac80211/aes_ccm.c
Diff comments   View file @ 87ae9af
... ... @@ -11,7 +11,6 @@
11 11 #include <linux/types.h>
12 12 #include <linux/crypto.h>
13 13 #include <linux/err.h>
14   -#include <asm/scatterlist.h>
15 14  
16 15 #include <net/mac80211.h>
17 16 #include "ieee80211_key.h"
net/sunrpc/auth_gss/gss_krb5_seal.c
Diff comments   View file @ 87ae9af
... ... @@ -63,7 +63,6 @@
63 63 #include <linux/jiffies.h>
64 64 #include <linux/sunrpc/gss_krb5.h>
65 65 #include <linux/random.h>
66   -#include <asm/scatterlist.h>
67 66 #include <linux/crypto.h>
68 67  
69 68 #ifdef RPC_DEBUG
net/sunrpc/auth_gss/gss_krb5_wrap.c
Diff comments   View file @ 87ae9af
... ... @@ -4,7 +4,6 @@
4 4 #include <linux/sunrpc/gss_krb5.h>
5 5 #include <linux/random.h>
6 6 #include <linux/pagemap.h>
7   -#include <asm/scatterlist.h>
8 7 #include <linux/crypto.h>
9 8  
10 9 #ifdef RPC_DEBUG
net/xfrm/xfrm_algo.c
Diff comments   View file @ 87ae9af
... ... @@ -21,7 +21,6 @@
21 21 #if defined(CONFIG_INET_ESP) || defined(CONFIG_INET_ESP_MODULE) || defined(CONFIG_INET6_ESP) || defined(CONFIG_INET6_ESP_MODULE)
22 22 #include <net/esp.h>
23 23 #endif
24   -#include <asm/scatterlist.h>
25 24  
26 25 /*
27 26 * Algorithms supported by IPsec. These entries contain properties which