projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] Define __raw_get_cpu_var and use it
[powerpc.git]
/
include
/
asm-powerpc
/
dma-mapping.h
diff --git
a/include/asm-powerpc/dma-mapping.h
b/include/asm-powerpc/dma-mapping.h
index
59a8016
..
2ab9baf
100644
(file)
--- a/
include/asm-powerpc/dma-mapping.h
+++ b/
include/asm-powerpc/dma-mapping.h
@@
-6,15
+6,14
@@
*/
#ifndef _ASM_DMA_MAPPING_H
#define _ASM_DMA_MAPPING_H
*/
#ifndef _ASM_DMA_MAPPING_H
#define _ASM_DMA_MAPPING_H
+#ifdef __KERNEL__
-#include <linux/config.h>
#include <linux/types.h>
#include <linux/cache.h>
/* need struct page definitions */
#include <linux/mm.h>
#include <asm/scatterlist.h>
#include <asm/io.h>
#include <linux/types.h>
#include <linux/cache.h>
/* need struct page definitions */
#include <linux/mm.h>
#include <asm/scatterlist.h>
#include <asm/io.h>
-#include <asm/bug.h>
#define DMA_ERROR_CODE (~(dma_addr_t)0x0)
#define DMA_ERROR_CODE (~(dma_addr_t)0x0)
@@
-229,7
+228,7
@@
static inline int dma_get_cache_alignment(void)
#ifdef CONFIG_PPC64
/* no easy way to get cache size on all processors, so return
* the maximum possible, to be safe */
#ifdef CONFIG_PPC64
/* 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
);
#else
/*
* Each processor family will define its own L1_CACHE_SHIFT,
#else
/*
* Each processor family will define its own L1_CACHE_SHIFT,
@@
-282,4
+281,5
@@
struct dma_mapping_ops {
int (*dac_dma_supported)(struct device *dev, u64 mask);
};
int (*dac_dma_supported)(struct device *dev, u64 mask);
};
+#endif /* __KERNEL__ */
#endif /* _ASM_DMA_MAPPING_H */
#endif /* _ASM_DMA_MAPPING_H */