Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 11763609 authored by Ralf Baechle's avatar Ralf Baechle Committed by Linus Torvalds
Browse files

[PATCH] Fix breakage after SG cleanups 



Commits

  58b053e4 ("Update arch/ to use sg helpers")
  45711f1a ("[SG] Update drivers to use sg helpers")
  fa05f128 ("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: default avatarRalf Baechle <ralf@linux-mips.org>
Signed-off-by: default avatarJens Axboe <jens.axboe@oracle.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 891039a9

drivers/block/DAC960.c

+1 −0
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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/ieee1394/dma.c

+1 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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>