Fix breakage after SG cleanups
Subsystems (9)
PATCH 1/1 Fix breakage after SG cleanups
Patches
58b053e4ce9d2fc3023645c1b96e537c72aa8d9a
45711f1af6eff1a6d010703b4862e0d2b9afd056
fa05f1286be25a8ce915c5dd492aea61126b3f33
convert 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 <[email protected]>
---
drivers/block/DAC960.c | 1 + drivers/block/cpqarray.c | 1 + drivers/block/sx8.c | 1 + drivers/ide/ide-probe.c | 1 + drivers/ieee1394/dma.c | 2 +- drivers/media/video/ivtv/ivtv-driver.h | 1 + drivers/media/video/videobuf-dma-sg.c | 1 + drivers/mmc/host/sdhci.c | 1 + drivers/usb/core/message.c | 2 +- include/media/saa7146.h | 1 + net/ieee80211/ieee80211_crypt_tkip.c | 1 + net/ieee80211/ieee80211_crypt_wep.c | 1 + net/mac80211/wep.c | 2 +- net/sctp/sm_make_chunk.c | 2 +- net/xfrm/xfrm_algo.c | 2 +- 15 files changed, 15 insertions(+), 5 deletions(-)
drivers/block/DAC960.c +1 -0
@@ -44,6 +44,7 @@#include <linux/init.h> #include <linux/jiffies.h> #include <linux/random.h> +#include <linux/scatterlist.h> #include <asm/io.h> #include <asm/uaccess.h> #include "DAC960.h"
drivers/block/cpqarray.c +1 -0
@@ -37,6 +37,7 @@#include <linux/spinlock.h> #include <linux/blkdev.h> #include <linux/genhd.h> +#include <linux/scatterlist.h> #include <asm/uaccess.h> #include <asm/io.h>
drivers/block/sx8.c +1 -0
@@ -27,6 +27,7 @@#include <linux/hdreg.h> #include <linux/dma-mapping.h> #include <linux/completion.h> +#include <linux/scatterlist.h> #include <asm/io.h> #include <asm/uaccess.h>
drivers/ide/ide-probe.c +1 -0
@@ -47,6 +47,7 @@#include <linux/spinlock.h> #include <linux/kmod.h> #include <linux/pci.h> +#include <linux/scatterlist.h> #include <asm/byteorder.h> #include <asm/irq.h>
drivers/ieee1394/dma.c +1 -1
@@ -12,7 +12,7 @@#include <linux/pci.h> #include <linux/slab.h> #include <linux/vmalloc.h> -#include <asm/scatterlist.h> +#include <linux/scatterlist.h> #include "dma.h"
drivers/media/video/ivtv/ivtv-driver.h +1 -0
@@ -51,6 +51,7 @@#include <linux/unistd.h> #include <linux/byteorder/swab.h> #include <linux/pagemap.h> +#include <linux/scatterlist.h> #include <linux/workqueue.h> #include <linux/mutex.h> #include <asm/uaccess.h>
drivers/media/video/videobuf-dma-sg.c +1 -0
@@ -27,6 +27,7 @@#include <linux/pci.h> #include <linux/vmalloc.h> #include <linux/pagemap.h> +#include <linux/scatterlist.h> #include <asm/page.h> #include <asm/pgtable.h>
drivers/mmc/host/sdhci.c +1 -0
@@ -13,6 +13,7 @@#include <linux/highmem.h> #include <linux/pci.h> #include <linux/dma-mapping.h> +#include <linux/scatterlist.h> #include <linux/mmc/host.h>
drivers/usb/core/message.c +1 -1
@@ -11,9 +11,9 @@#include <linux/timer.h> #include <linux/ctype.h> #include <linux/device.h> +#include <linux/scatterlist.h> #include <linux/usb/quirks.h> #include <asm/byteorder.h> -#include <asm/scatterlist.h> #include "hcd.h" /* for usbcore internals */ #include "usb.h"
include/media/saa7146.h +1 -0
@@ -12,6 +12,7 @@#include <asm/io.h> /* for accessing devices */ #include <linux/stringify.h> #include <linux/mutex.h> +#include <linux/scatterlist.h> #include <linux/vmalloc.h> /* for vmalloc() */ #include <linux/mm.h> /* for vmalloc_to_page() */
net/ieee80211/ieee80211_crypt_tkip.c +1 -0
@@ -14,6 +14,7 @@#include <linux/init.h> #include <linux/slab.h> #include <linux/random.h> +#include <linux/scatterlist.h> #include <linux/skbuff.h> #include <linux/netdevice.h> #include <linux/mm.h>
net/ieee80211/ieee80211_crypt_wep.c +1 -0
@@ -14,6 +14,7 @@#include <linux/init.h> #include <linux/slab.h> #include <linux/random.h> +#include <linux/scatterlist.h> #include <linux/skbuff.h> #include <linux/mm.h> #include <asm/string.h>
net/mac80211/wep.c +1 -1
@@ -16,7 +16,7 @@#include <linux/crypto.h> #include <linux/err.h> #include <linux/mm.h> -#include <asm/scatterlist.h> +#include <linux/scatterlist.h> #include <net/mac80211.h> #include "ieee80211_i.h"
net/sctp/sm_make_chunk.c +1 -1
@@ -56,7 +56,7 @@#include <linux/ipv6.h> #include <linux/net.h> #include <linux/inet.h> -#include <asm/scatterlist.h> +#include <linux/scatterlist.h> #include <linux/crypto.h> #include <net/sock.h>
net/xfrm/xfrm_algo.c +1 -1
@@ -13,6 +13,7 @@#include <linux/kernel.h> #include <linux/pfkeyv2.h> #include <linux/crypto.h> +#include <linux/scatterlist.h> #include <net/xfrm.h> #if defined(CONFIG_INET_AH ) || defined(CONFIG_INET_AH_MODULE ) || defined(CONFIG_INET6_AH ) || defined(CONFIG_INET6_AH_MODULE )#include <net/ah.h>
@@ -20,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
Quoted 6 lines · Ralf Baechle
Patches
58b053e4ce9d2fc3023645c1b96e537c72aa8d9a 45711f1af6eff1a6d010703b4862e0d2b9afd056 fa05f1286be25a8ce915c5dd492aea61126b3f33
Quoted 8 lines
convert 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.
Thanks Ralf, I cut the pieces that are already merged and applied the rest.
Signature · 1 line
Jens Axboe