From: Ingo Molnar Date: Wed, 30 Jul 2008 17:33:48 +0000 (+0200) Subject: Merge commit 'v2.6.27-rc1' into x86/core X-Git-Tag: v2.6.28-rc1~699^2^8~23^2 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=15dd859cacf312f606f54502d1f66537a1e5c78c;p=linux-2.6-omap-h63xx.git Merge commit 'v2.6.27-rc1' into x86/core Conflicts: include/asm-x86/dma-mapping.h include/asm-x86/namei.h include/asm-x86/uaccess.h Signed-off-by: Ingo Molnar --- 15dd859cacf312f606f54502d1f66537a1e5c78c diff --cc include/asm-x86/dma-mapping.h index 71b6f7d22e9,ad9cd6d49bf..5d200e78bd8 --- a/include/asm-x86/dma-mapping.h +++ b/include/asm-x86/dma-mapping.h @@@ -212,25 -249,5 +249,5 @@@ static inline int dma_get_cache_alignme #define dma_is_consistent(d, h) (1) - #ifdef CONFIG_X86_32 - # define ARCH_HAS_DMA_DECLARE_COHERENT_MEMORY - struct dma_coherent_mem { - void *virt_base; - u32 device_base; - int size; - int flags; - unsigned long *bitmap; - }; - - extern int - dma_declare_coherent_memory(struct device *dev, dma_addr_t bus_addr, - dma_addr_t device_addr, size_t size, int flags); - - extern void - dma_release_declared_memory(struct device *dev); - - extern void * - dma_mark_declared_memory_occupied(struct device *dev, - dma_addr_t device_addr, size_t size); - #endif /* CONFIG_X86_32 */ + #include -#endif +#endif /* ASM_X86__DMA_MAPPING_H */ diff --cc include/asm-x86/uaccess.h index 1838f3959a5,5f702d1d521..48ebc0ad40e --- a/include/asm-x86/uaccess.h +++ b/include/asm-x86/uaccess.h @@@ -450,4 -450,5 +450,5 @@@ extern struct movsl_mask # include "uaccess_64.h" #endif -#endif +#endif /* ASM_X86__UACCESS_H */ +