--- zzzz-none-000/linux-2.6.39.4/arch/arm/include/asm/cacheflush.h 2011-08-03 19:43:28.000000000 +0000 +++ puma6-arm-6490-729/linux-2.6.39.4/arch/arm/include/asm/cacheflush.h 2021-11-10 13:23:09.000000000 +0000 @@ -19,6 +19,9 @@ #define CACHE_COLOUR(vaddr) ((vaddr & (SHMLBA - 1)) >> PAGE_SHIFT) + + + /* * This flag is used to indicate that the page pointed to by a pte is clean * and does not require cleaning before returning it to the user. @@ -133,7 +136,10 @@ */ #define dmac_map_area cpu_cache.dma_map_area #define dmac_unmap_area cpu_cache.dma_unmap_area -#define dmac_flush_range cpu_cache.dma_flush_range +#define dmac_flush_range cpu_cache.dma_flush_range +#define dmac_inv_range dmac_flush_range +#define dmac_clean_range dmac_flush_range + #else @@ -155,6 +161,9 @@ extern void dmac_unmap_area(const void *, size_t, int); extern void dmac_flush_range(const void *, const void *); +#define dmac_inv_range dmac_flush_range +#define dmac_clean_range dmac_flush_range + #endif /* @@ -221,7 +230,7 @@ } static inline void -vivt_flush_cache_page(struct vm_area_struct *vma, unsigned long user_addr, unsigned long pfn) +vivt_flush_cache_page(struct vm_area_struct *vma, unsigned long user_addr, unsigned long pfn __attribute__((unused))) { if (cpumask_test_cpu(smp_processor_id(), mm_cpumask(vma->vm_mm))) { unsigned long addr = user_addr & PAGE_MASK; @@ -301,7 +310,7 @@ } #define ARCH_HAS_FLUSH_KERNEL_DCACHE_PAGE -static inline void flush_kernel_dcache_page(struct page *page) +static inline void flush_kernel_dcache_page(struct page *page __attribute__((unused))) { } @@ -326,7 +335,7 @@ * data, we need to do a full cache flush to ensure that writebacks * don't corrupt data placed into these pages via the new mappings. */ -static inline void flush_cache_vmap(unsigned long start, unsigned long end) +static inline void flush_cache_vmap(unsigned long start __attribute__((unused)), unsigned long end __attribute__((unused))) { if (!cache_is_vipt_nonaliasing()) flush_cache_all(); @@ -338,7 +347,7 @@ dsb(); } -static inline void flush_cache_vunmap(unsigned long start, unsigned long end) +static inline void flush_cache_vunmap(unsigned long start __attribute__((unused)), unsigned long end __attribute__((unused))) { if (!cache_is_vipt_nonaliasing()) flush_cache_all();