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]
/
include
/
asm-generic
/
dma-mapping.h
diff --git
a/include/asm-generic/dma-mapping.h
b/include/asm-generic/dma-mapping.h
index
04a28e6
..
1b35620
100644
(file)
--- a/
include/asm-generic/dma-mapping.h
+++ b/
include/asm-generic/dma-mapping.h
@@
-35,7
+35,7
@@
dma_set_mask(struct device *dev, u64 dma_mask)
static inline void *
dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle,
static inline void *
dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle,
-
in
t flag)
+
gfp_
t flag)
{
BUG_ON(dev->bus != &pci_bus_type);
{
BUG_ON(dev->bus != &pci_bus_type);
@@
-168,7
+168,7
@@
dma_set_mask(struct device *dev, u64 dma_mask)
static inline void *
dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle,
static inline void *
dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle,
-
in
t flag)
+
gfp_
t flag)
{
BUG();
return NULL;
{
BUG();
return NULL;
@@
-274,7
+274,7
@@
dma_get_cache_alignment(void)
{
/* no easy way to get cache size on all processors, so return
* the maximum possible, to be safe */
{
/* no easy way to get cache size on all processors, so return
* the maximum possible, to be safe */
- return (1 <<
L1_CACHE_SHIFT_MAX
);
+ return (1 <<
INTERNODE_CACHE_SHIFT
);
}
static inline void
}
static inline void