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

Commit 32882912 authored by Florian Fainelli's avatar Florian Fainelli Committed by Russell King
Browse files

ARM: 8724/1: v7: allow setting different cache functions 



In preparation for adding support for the Broadcom Brahma-B15 read-ahead
cache which requires a different set of cache functions, allow the
__v7_proc macro to override the cache_fns settings, and default to
v7_cache_fns unless specified otherwise.

Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
parent c6089061

arch/arm/mm/proc-v7.S

+2 −2
Original line number Diff line number Diff line
@@ -567,7 +567,7 @@ __v7_setup_stack: 
	/*

	 * Standard v7 proc info content

	 */

.macro __v7_proc name, initfunc, mm_mmuflags = 0, io_mmuflags = 0, hwcaps = 0, proc_fns = v7_processor_functions

.macro __v7_proc name, initfunc, mm_mmuflags = 0, io_mmuflags = 0, hwcaps = 0, proc_fns = v7_processor_functions, cache_fns = v7_cache_fns

	ALT_SMP(.long	PMD_TYPE_SECT | PMD_SECT_AP_WRITE | PMD_SECT_AP_READ | \

			PMD_SECT_AF | PMD_FLAGS_SMP | \mm_mmuflags)

	ALT_UP(.long	PMD_TYPE_SECT | PMD_SECT_AP_WRITE | PMD_SECT_AP_READ | \
@@ -583,7 +583,7 @@ __v7_setup_stack: 
	.long	\proc_fns

	.long	v7wbi_tlb_fns

	.long	v6_user_fns

	.long	v7_cache_fns

	.long	\cache_fns

.endm



#ifndef CONFIG_ARM_LPAE