Commit 56616ebd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh64-2.6 

* master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh64-2.6:
  sh64: arch/sh64/kernel/setup.c: duplicate include removal.
  sh64: arch/sh64/kernel/signal.c: duplicate include removal
  sh64: Add missing dma_sync_single_for_*().
parents 203f3394 5ba056cb

arch/sh64/kernel/setup.c

+0 −4
Original line number Diff line number Diff line
@@ -59,10 +59,6 @@ 
#include <asm/setup.h>

#include <asm/smp.h>



#ifdef CONFIG_VT

#include <linux/console.h>

#endif



struct screen_info screen_info;



#ifdef CONFIG_BLK_DEV_RAM

arch/sh64/kernel/signal.c

+0 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ 
#include <linux/ptrace.h>

#include <linux/unistd.h>

#include <linux/stddef.h>

#include <linux/personality.h>

#include <asm/ucontext.h>

#include <asm/uaccess.h>

#include <asm/pgtable.h>

include/asm-sh64/dma-mapping.h

+18 −0
Original line number Diff line number Diff line
@@ -141,6 +141,24 @@ static inline void dma_sync_single_for_device(struct device *dev, 
	dma_sync_single(dev, dma_handle, size, dir);

}



static inline void dma_sync_single_range_for_cpu(struct device *dev,

						 dma_addr_t dma_handle,

						 unsigned long offset,

						 size_t size,

						 enum dma_data_direction direction)

{

	dma_sync_single_for_cpu(dev, dma_handle+offset, size, direction);

}



static inline void dma_sync_single_range_for_device(struct device *dev,

						    dma_addr_t dma_handle,

						    unsigned long offset,

						    size_t size,

						    enum dma_data_direction direction)

{

	dma_sync_single_for_device(dev, dma_handle+offset, size, direction);

}



static inline void dma_sync_sg_for_cpu(struct device *dev,

				       struct scatterlist *sg, int nelems,

				       enum dma_data_direction dir)