Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 305edadb authored by Will Deacon's avatar Will Deacon
Browse files

Merge branch 'arm/proc-macros' of git://git.linaro.org/people/dmart/linux-2.6-arm into for-rmk

parents b0af8dfd 2ba564b9

arch/arm/include/asm/assembler.h

+9 −0
Original line number Diff line number Diff line
@@ -293,4 +293,13 @@ 
	.macro	ldrusr, reg, ptr, inc, cond=al, rept=1, abort=9001f

	usracc	ldr, \reg, \ptr, \inc, \cond, \rept, \abort

	.endm



/* Utility macro for declaring string literals */

	.macro	string name:req, string

	.type \name , #object

\name:

	.asciz "\string"

	.size \name , . - \name

	.endm



#endif /* __ASM_ASSEMBLER_H__ */

arch/arm/mm/cache-fa.S

+2 −13
Original line number Diff line number Diff line
@@ -242,16 +242,5 @@ ENDPROC(fa_dma_unmap_area) 


	__INITDATA



	.type	fa_cache_fns, #object

ENTRY(fa_cache_fns)

	.long	fa_flush_icache_all

	.long	fa_flush_kern_cache_all

	.long	fa_flush_user_cache_all

	.long	fa_flush_user_cache_range

	.long	fa_coherent_kern_range

	.long	fa_coherent_user_range

	.long	fa_flush_kern_dcache_area

	.long	fa_dma_map_area

	.long	fa_dma_unmap_area

	.long	fa_dma_flush_range

	.size	fa_cache_fns, . - fa_cache_fns
 
	@ define struct cpu_cache_fns (see <asm/cacheflush.h> and proc-macros.S)

	define_cache_functions fa

arch/arm/mm/cache-v3.S

+2 −13
Original line number Diff line number Diff line
@@ -129,16 +129,5 @@ ENDPROC(v3_dma_map_area) 


	__INITDATA



	.type	v3_cache_fns, #object

ENTRY(v3_cache_fns)

	.long	v3_flush_icache_all

	.long	v3_flush_kern_cache_all

	.long	v3_flush_user_cache_all

	.long	v3_flush_user_cache_range

	.long	v3_coherent_kern_range

	.long	v3_coherent_user_range

	.long	v3_flush_kern_dcache_area

	.long	v3_dma_map_area

	.long	v3_dma_unmap_area

	.long	v3_dma_flush_range

	.size	v3_cache_fns, . - v3_cache_fns
 
	@ define struct cpu_cache_fns (see <asm/cacheflush.h> and proc-macros.S)

	define_cache_functions v3

arch/arm/mm/cache-v4.S

+2 −13
Original line number Diff line number Diff line
@@ -141,16 +141,5 @@ ENDPROC(v4_dma_map_area) 


	__INITDATA



	.type	v4_cache_fns, #object

ENTRY(v4_cache_fns)

	.long	v4_flush_icache_all

	.long	v4_flush_kern_cache_all

	.long	v4_flush_user_cache_all

	.long	v4_flush_user_cache_range

	.long	v4_coherent_kern_range

	.long	v4_coherent_user_range

	.long	v4_flush_kern_dcache_area

	.long	v4_dma_map_area

	.long	v4_dma_unmap_area

	.long	v4_dma_flush_range

	.size	v4_cache_fns, . - v4_cache_fns
 
	@ define struct cpu_cache_fns (see <asm/cacheflush.h> and proc-macros.S)

	define_cache_functions v4

arch/arm/mm/cache-v4wb.S

+2 −13
Original line number Diff line number Diff line
@@ -253,16 +253,5 @@ ENDPROC(v4wb_dma_unmap_area) 


	__INITDATA



	.type	v4wb_cache_fns, #object

ENTRY(v4wb_cache_fns)

	.long	v4wb_flush_icache_all

	.long	v4wb_flush_kern_cache_all

	.long	v4wb_flush_user_cache_all

	.long	v4wb_flush_user_cache_range

	.long	v4wb_coherent_kern_range

	.long	v4wb_coherent_user_range

	.long	v4wb_flush_kern_dcache_area

	.long	v4wb_dma_map_area

	.long	v4wb_dma_unmap_area

	.long	v4wb_dma_flush_range

	.size	v4wb_cache_fns, . - v4wb_cache_fns
 
	@ define struct cpu_cache_fns (see <asm/cacheflush.h> and proc-macros.S)

	define_cache_functions v4wb