projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
powerpc/kernel: Use kprobe blacklist for asm functions
[cascardo/linux.git]
/
arch
/
powerpc
/
kernel
/
dma.c
diff --git
a/arch/powerpc/kernel/dma.c
b/arch/powerpc/kernel/dma.c
index
3f1472a
..
e64a601
100644
(file)
--- a/
arch/powerpc/kernel/dma.c
+++ b/
arch/powerpc/kernel/dma.c
@@
-64,7
+64,7
@@
static int dma_direct_dma_supported(struct device *dev, u64 mask)
void *__dma_direct_alloc_coherent(struct device *dev, size_t size,
dma_addr_t *dma_handle, gfp_t flag,
void *__dma_direct_alloc_coherent(struct device *dev, size_t size,
dma_addr_t *dma_handle, gfp_t flag,
-
struct dma_attrs *
attrs)
+
unsigned long
attrs)
{
void *ret;
#ifdef CONFIG_NOT_COHERENT_CACHE
{
void *ret;
#ifdef CONFIG_NOT_COHERENT_CACHE
@@
-121,7
+121,7
@@
void *__dma_direct_alloc_coherent(struct device *dev, size_t size,
void __dma_direct_free_coherent(struct device *dev, size_t size,
void *vaddr, dma_addr_t dma_handle,
void __dma_direct_free_coherent(struct device *dev, size_t size,
void *vaddr, dma_addr_t dma_handle,
-
struct dma_attrs *
attrs)
+
unsigned long
attrs)
{
#ifdef CONFIG_NOT_COHERENT_CACHE
__dma_free_coherent(size, vaddr);
{
#ifdef CONFIG_NOT_COHERENT_CACHE
__dma_free_coherent(size, vaddr);
@@
-132,7
+132,7
@@
void __dma_direct_free_coherent(struct device *dev, size_t size,
static void *dma_direct_alloc_coherent(struct device *dev, size_t size,
dma_addr_t *dma_handle, gfp_t flag,
static void *dma_direct_alloc_coherent(struct device *dev, size_t size,
dma_addr_t *dma_handle, gfp_t flag,
-
struct dma_attrs *
attrs)
+
unsigned long
attrs)
{
struct iommu_table *iommu;
{
struct iommu_table *iommu;
@@
-156,7
+156,7
@@
static void *dma_direct_alloc_coherent(struct device *dev, size_t size,
static void dma_direct_free_coherent(struct device *dev, size_t size,
void *vaddr, dma_addr_t dma_handle,
static void dma_direct_free_coherent(struct device *dev, size_t size,
void *vaddr, dma_addr_t dma_handle,
-
struct dma_attrs *
attrs)
+
unsigned long
attrs)
{
struct iommu_table *iommu;
{
struct iommu_table *iommu;
@@
-177,7
+177,7
@@
static void dma_direct_free_coherent(struct device *dev, size_t size,
int dma_direct_mmap_coherent(struct device *dev, struct vm_area_struct *vma,
void *cpu_addr, dma_addr_t handle, size_t size,
int dma_direct_mmap_coherent(struct device *dev, struct vm_area_struct *vma,
void *cpu_addr, dma_addr_t handle, size_t size,
-
struct dma_attrs *
attrs)
+
unsigned long
attrs)
{
unsigned long pfn;
{
unsigned long pfn;
@@
-195,7
+195,7
@@
int dma_direct_mmap_coherent(struct device *dev, struct vm_area_struct *vma,
static int dma_direct_map_sg(struct device *dev, struct scatterlist *sgl,
int nents, enum dma_data_direction direction,
static int dma_direct_map_sg(struct device *dev, struct scatterlist *sgl,
int nents, enum dma_data_direction direction,
-
struct dma_attrs *
attrs)
+
unsigned long
attrs)
{
struct scatterlist *sg;
int i;
{
struct scatterlist *sg;
int i;
@@
-211,7
+211,7
@@
static int dma_direct_map_sg(struct device *dev, struct scatterlist *sgl,
static void dma_direct_unmap_sg(struct device *dev, struct scatterlist *sg,
int nents, enum dma_data_direction direction,
static void dma_direct_unmap_sg(struct device *dev, struct scatterlist *sg,
int nents, enum dma_data_direction direction,
-
struct dma_attrs *
attrs)
+
unsigned long
attrs)
{
}
{
}
@@
-232,7
+232,7
@@
static inline dma_addr_t dma_direct_map_page(struct device *dev,
unsigned long offset,
size_t size,
enum dma_data_direction dir,
unsigned long offset,
size_t size,
enum dma_data_direction dir,
-
struct dma_attrs *
attrs)
+
unsigned long
attrs)
{
BUG_ON(dir == DMA_NONE);
__dma_sync_page(page, offset, size, dir);
{
BUG_ON(dir == DMA_NONE);
__dma_sync_page(page, offset, size, dir);
@@
-243,7
+243,7
@@
static inline void dma_direct_unmap_page(struct device *dev,
dma_addr_t dma_address,
size_t size,
enum dma_data_direction direction,
dma_addr_t dma_address,
size_t size,
enum dma_data_direction direction,
-
struct dma_attrs *
attrs)
+
unsigned long
attrs)
{
}
{
}