[PATCH] Fix breakage after SG cleanups

Commits

58b053e4ce9d2fc3023645c1b96e537c72aa8d9a ("Update arch/ to use sg helpers")
45711f1af6eff1a6d010703b4862e0d2b9afd056 ("[SG] Update drivers to use sg helpers")
fa05f1286be25a8ce915c5dd492aea61126b3f33 ("Update net/ to use sg helpers")

converted many files to use the scatter gather helpers without ensuring
that the necessary headerfile <linux/scatterlist> is included. This
happened to work for ia64, powerpc, sparc64 and x86 because they
happened to drag in that file via their <asm/dma-mapping.h>.

On most of the others this probably broke.

Instead of increasing the header file spider web I choose to include
<linux/scatterlist.h> directly into the affectes files.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by Ralf Baechle and committed by Linus Torvalds 11763609 891039a9

+12 -3
+1
drivers/block/DAC960.c
··· 44 #include <linux/init.h> 45 #include <linux/jiffies.h> 46 #include <linux/random.h> 47 #include <asm/io.h> 48 #include <asm/uaccess.h> 49 #include "DAC960.h"
··· 44 #include <linux/init.h> 45 #include <linux/jiffies.h> 46 #include <linux/random.h> 47 + #include <linux/scatterlist.h> 48 #include <asm/io.h> 49 #include <asm/uaccess.h> 50 #include "DAC960.h"
+1
drivers/block/cpqarray.c
··· 37 #include <linux/spinlock.h> 38 #include <linux/blkdev.h> 39 #include <linux/genhd.h> 40 #include <asm/uaccess.h> 41 #include <asm/io.h> 42
··· 37 #include <linux/spinlock.h> 38 #include <linux/blkdev.h> 39 #include <linux/genhd.h> 40 + #include <linux/scatterlist.h> 41 #include <asm/uaccess.h> 42 #include <asm/io.h> 43
+1
drivers/block/sx8.c
··· 27 #include <linux/hdreg.h> 28 #include <linux/dma-mapping.h> 29 #include <linux/completion.h> 30 #include <asm/io.h> 31 #include <asm/uaccess.h> 32
··· 27 #include <linux/hdreg.h> 28 #include <linux/dma-mapping.h> 29 #include <linux/completion.h> 30 + #include <linux/scatterlist.h> 31 #include <asm/io.h> 32 #include <asm/uaccess.h> 33
+1 -1
drivers/ieee1394/dma.c
··· 12 #include <linux/pci.h> 13 #include <linux/slab.h> 14 #include <linux/vmalloc.h> 15 - #include <asm/scatterlist.h> 16 17 #include "dma.h" 18
··· 12 #include <linux/pci.h> 13 #include <linux/slab.h> 14 #include <linux/vmalloc.h> 15 + #include <linux/scatterlist.h> 16 17 #include "dma.h" 18
+1
drivers/media/video/ivtv/ivtv-driver.h
··· 51 #include <linux/unistd.h> 52 #include <linux/byteorder/swab.h> 53 #include <linux/pagemap.h> 54 #include <linux/workqueue.h> 55 #include <linux/mutex.h> 56 #include <asm/uaccess.h>
··· 51 #include <linux/unistd.h> 52 #include <linux/byteorder/swab.h> 53 #include <linux/pagemap.h> 54 + #include <linux/scatterlist.h> 55 #include <linux/workqueue.h> 56 #include <linux/mutex.h> 57 #include <asm/uaccess.h>
+1
drivers/media/video/videobuf-dma-sg.c
··· 27 #include <linux/pci.h> 28 #include <linux/vmalloc.h> 29 #include <linux/pagemap.h> 30 #include <asm/page.h> 31 #include <asm/pgtable.h> 32
··· 27 #include <linux/pci.h> 28 #include <linux/vmalloc.h> 29 #include <linux/pagemap.h> 30 + #include <linux/scatterlist.h> 31 #include <asm/page.h> 32 #include <asm/pgtable.h> 33
+1
drivers/mmc/host/sdhci.c
··· 13 #include <linux/highmem.h> 14 #include <linux/pci.h> 15 #include <linux/dma-mapping.h> 16 17 #include <linux/mmc/host.h> 18
··· 13 #include <linux/highmem.h> 14 #include <linux/pci.h> 15 #include <linux/dma-mapping.h> 16 + #include <linux/scatterlist.h> 17 18 #include <linux/mmc/host.h> 19
+1 -1
drivers/usb/core/message.c
··· 11 #include <linux/timer.h> 12 #include <linux/ctype.h> 13 #include <linux/device.h> 14 #include <linux/usb/quirks.h> 15 #include <asm/byteorder.h> 16 - #include <asm/scatterlist.h> 17 18 #include "hcd.h" /* for usbcore internals */ 19 #include "usb.h"
··· 11 #include <linux/timer.h> 12 #include <linux/ctype.h> 13 #include <linux/device.h> 14 + #include <linux/scatterlist.h> 15 #include <linux/usb/quirks.h> 16 #include <asm/byteorder.h> 17 18 #include "hcd.h" /* for usbcore internals */ 19 #include "usb.h"
+1
include/media/saa7146.h
··· 12 #include <asm/io.h> /* for accessing devices */ 13 #include <linux/stringify.h> 14 #include <linux/mutex.h> 15 16 #include <linux/vmalloc.h> /* for vmalloc() */ 17 #include <linux/mm.h> /* for vmalloc_to_page() */
··· 12 #include <asm/io.h> /* for accessing devices */ 13 #include <linux/stringify.h> 14 #include <linux/mutex.h> 15 + #include <linux/scatterlist.h> 16 17 #include <linux/vmalloc.h> /* for vmalloc() */ 18 #include <linux/mm.h> /* for vmalloc_to_page() */
+1
net/ieee80211/ieee80211_crypt_tkip.c
··· 14 #include <linux/init.h> 15 #include <linux/slab.h> 16 #include <linux/random.h> 17 #include <linux/skbuff.h> 18 #include <linux/netdevice.h> 19 #include <linux/mm.h>
··· 14 #include <linux/init.h> 15 #include <linux/slab.h> 16 #include <linux/random.h> 17 + #include <linux/scatterlist.h> 18 #include <linux/skbuff.h> 19 #include <linux/netdevice.h> 20 #include <linux/mm.h>
+1
net/ieee80211/ieee80211_crypt_wep.c
··· 14 #include <linux/init.h> 15 #include <linux/slab.h> 16 #include <linux/random.h> 17 #include <linux/skbuff.h> 18 #include <linux/mm.h> 19 #include <asm/string.h>
··· 14 #include <linux/init.h> 15 #include <linux/slab.h> 16 #include <linux/random.h> 17 + #include <linux/scatterlist.h> 18 #include <linux/skbuff.h> 19 #include <linux/mm.h> 20 #include <asm/string.h>
+1 -1
net/mac80211/wep.c
··· 16 #include <linux/crypto.h> 17 #include <linux/err.h> 18 #include <linux/mm.h> 19 - #include <asm/scatterlist.h> 20 21 #include <net/mac80211.h> 22 #include "ieee80211_i.h"
··· 16 #include <linux/crypto.h> 17 #include <linux/err.h> 18 #include <linux/mm.h> 19 + #include <linux/scatterlist.h> 20 21 #include <net/mac80211.h> 22 #include "ieee80211_i.h"