From 9495362ae1e5babf699732ed0894fb17c981ec2d Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E9=BB=84=E6=B6=9B?= Date: Mon, 1 Aug 2011 11:19:22 +0800 Subject: [PATCH] rk29: memory.h: fix for v2.6.36 --- arch/arm/mach-rk29/include/mach/memory.h | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-rk29/include/mach/memory.h b/arch/arm/mach-rk29/include/mach/memory.h index ec54cf72265d..bdbbf17a6862 100644 --- a/arch/arm/mach-rk29/include/mach/memory.h +++ b/arch/arm/mach-rk29/include/mach/memory.h @@ -18,6 +18,7 @@ #include #include +#include /* physical offset of RAM */ #define PHYS_OFFSET UL(0x60000000) @@ -40,8 +41,11 @@ __arch_adjust_zones(int node, unsigned long *zone_size, unsigned long *zhole_siz zhole_size[0] = 0; } -#define arch_adjust_zones(node, zone_size, zhole_size) \ - __arch_adjust_zones(node, zone_size, zhole_size) +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 36)) +#define arch_adjust_zones(zone_size, zhole_size) __arch_adjust_zones(0, zone_size, zhole_size) +#else +#define arch_adjust_zones(node, zone_size, zhole_size) __arch_adjust_zones(node, zone_size, zhole_size) +#endif #endif /* CONFIG_ZONE_DMA */ @@ -53,5 +57,10 @@ __arch_adjust_zones(int node, unsigned long *zone_size, unsigned long *zhole_siz #define SRAM_DATA_OFFSET 0xFEF03000 #define SRAM_DATA_END 0xFEF03FFF +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 34)) +#define dmac_clean_range(start, end) dmac_map_area(start, end - start, DMA_TO_DEVICE) +#define dmac_inv_range(start, end) dmac_unmap_area(start, end - start, DMA_FROM_DEVICE) +#endif + #endif -- 2.34.1