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

Commit a4c80d2a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC32]: Spelling fixes
  [SPARC64]: Spelling fixes
  [SPARC64]: Fix OOPS in dma_sync_*_for_device()
parents 76be8950 5b2afff2

arch/sparc/kernel/ptrace.c

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
 * Based upon code written by Ross Biro, Linus Torvalds, Bob Manson,

 * and David Mosberger.

 *

 * Added Linux support -miguel (weird, eh?, the orignal code was meant

 * Added Linux support -miguel (weird, eh?, the original code was meant

 * to emulate SunOS).

 */

arch/sparc64/kernel/pci_schizo.c

+1 −1
Original line number Diff line number Diff line
@@ -850,7 +850,7 @@ static int pbm_routes_this_ino(struct pci_pbm_info *pbm, u32 ino) 
/* How the Tomatillo IRQs are routed around is pure guesswork here.

 *

 * All the Tomatillo devices I see in prtconf dumps seem to have only

 * a single PCI bus unit attached to it.  It would seem they are seperate

 * a single PCI bus unit attached to it.  It would seem they are separate

 * devices because their PortID (ie. JBUS ID) values are all different

 * and thus the registers are mapped to totally different locations.

 *

include/asm-sparc64/dma-mapping.h

+3 −9
Original line number Diff line number Diff line
@@ -25,15 +25,9 @@ struct dma_ops { 
	void (*sync_single_for_cpu)(struct device *dev,

				    dma_addr_t dma_handle, size_t size,

				    enum dma_data_direction direction);

	void (*sync_single_for_device)(struct device *dev,

				       dma_addr_t dma_handle, size_t size,

				       enum dma_data_direction direction);

	void (*sync_sg_for_cpu)(struct device *dev, struct scatterlist *sg,

				int nelems,

				enum dma_data_direction direction);

	void (*sync_sg_for_device)(struct device *dev, struct scatterlist *sg,

				   int nelems,

				   enum dma_data_direction direction);

};

extern const struct dma_ops *dma_ops;
@@ -105,7 +99,7 @@ static inline void dma_sync_single_for_device(struct device *dev, 
					      size_t size,

					      enum dma_data_direction direction)

{

	dma_ops->sync_single_for_device(dev, dma_handle, size, direction);

	/* No flushing needed to sync cpu writes to the device.  */

}



static inline void dma_sync_single_range_for_cpu(struct device *dev,
@@ -123,7 +117,7 @@ static inline void dma_sync_single_range_for_device(struct device *dev, 
						    size_t size,

						    enum dma_data_direction direction)

{

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

	/* No flushing needed to sync cpu writes to the device.  */

}
@@ -138,7 +132,7 @@ static inline void dma_sync_sg_for_device(struct device *dev, 
					  struct scatterlist *sg, int nelems,

					  enum dma_data_direction direction)

{

	dma_ops->sync_sg_for_device(dev, sg, nelems, direction);

	/* No flushing needed to sync cpu writes to the device.  */

}



static inline int dma_mapping_error(dma_addr_t dma_addr)