projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branches 'pm-cpufreq' and 'pm-cpuidle'
[firefly-linux-kernel-4.4.55.git]
/
include
/
linux
/
dma-contiguous.h
diff --git
a/include/linux/dma-contiguous.h
b/include/linux/dma-contiguous.h
index 772eab5d524abb7e6e2bff2fa60cb8fadaad7054..fec734df1524799e1e7137e943098c907d0fce8c 100644
(file)
--- a/
include/linux/dma-contiguous.h
+++ b/
include/linux/dma-contiguous.h
@@
-53,18
+53,13
@@
#ifdef __KERNEL__
#ifdef __KERNEL__
+#include <linux/device.h>
+
struct cma;
struct page;
struct cma;
struct page;
-struct device;
#ifdef CONFIG_DMA_CMA
#ifdef CONFIG_DMA_CMA
-/*
- * There is always at least global CMA area and a few optional device
- * private areas configured in kernel .config.
- */
-#define MAX_CMA_AREAS (1 + CONFIG_CMA_AREAS)
-
extern struct cma *dma_contiguous_default_area;
static inline struct cma *dev_get_cma_area(struct device *dev)
extern struct cma *dma_contiguous_default_area;
static inline struct cma *dev_get_cma_area(struct device *dev)
@@
-116,15
+111,13
@@
static inline int dma_declare_contiguous(struct device *dev, phys_addr_t size,
return ret;
}
return ret;
}
-struct page *dma_alloc_from_contiguous(struct device *dev,
in
t count,
+struct page *dma_alloc_from_contiguous(struct device *dev,
size_
t count,
unsigned int order);
bool dma_release_from_contiguous(struct device *dev, struct page *pages,
int count);
#else
unsigned int order);
bool dma_release_from_contiguous(struct device *dev, struct page *pages,
int count);
#else
-#define MAX_CMA_AREAS (0)
-
static inline struct cma *dev_get_cma_area(struct device *dev)
{
return NULL;
static inline struct cma *dev_get_cma_area(struct device *dev)
{
return NULL;
@@
-151,7
+144,7
@@
int dma_declare_contiguous(struct device *dev, phys_addr_t size,
}
static inline
}
static inline
-struct page *dma_alloc_from_contiguous(struct device *dev,
in
t count,
+struct page *dma_alloc_from_contiguous(struct device *dev,
size_
t count,
unsigned int order)
{
return NULL;
unsigned int order)
{
return NULL;