git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
drivers
/
base
/
dmapool.c
diff --git
a/drivers/base/dmapool.c
b/drivers/base/dmapool.c
index
f48833d
..
e2f64f9
100644
(file)
--- a/
drivers/base/dmapool.c
+++ b/
drivers/base/dmapool.c
@@
-41,7
+41,7
@@
struct dma_page { /* cacheable header for 'allocation' bytes */
static DECLARE_MUTEX (pools_lock);
static ssize_t
static DECLARE_MUTEX (pools_lock);
static ssize_t
-show_pools (struct device *dev, char *buf)
+show_pools (struct device *dev,
struct device_attribute *attr,
char *buf)
{
unsigned temp;
unsigned size;
{
unsigned temp;
unsigned size;
@@
-156,7
+156,7
@@
dma_pool_create (const char *name, struct device *dev,
static struct dma_page *
static struct dma_page *
-pool_alloc_page (struct dma_pool *pool,
unsigned int __nocas
t mem_flags)
+pool_alloc_page (struct dma_pool *pool,
gfp_
t mem_flags)
{
struct dma_page *page;
int mapsize;
{
struct dma_page *page;
int mapsize;
@@
-262,7
+262,7
@@
dma_pool_destroy (struct dma_pool *pool)
* If such a memory block can't be allocated, null is returned.
*/
void *
* If such a memory block can't be allocated, null is returned.
*/
void *
-dma_pool_alloc (struct dma_pool *pool,
in
t mem_flags, dma_addr_t *handle)
+dma_pool_alloc (struct dma_pool *pool,
gfp_
t mem_flags, dma_addr_t *handle)
{
unsigned long flags;
struct dma_page *page;
{
unsigned long flags;
struct dma_page *page;