summaryrefslogtreecommitdiffstats
path: root/arch/mips/include/asm/maar.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2015-09-28 08:06:57 +0200
committerIngo Molnar <mingo@kernel.org>2015-09-28 08:06:57 +0200
commit6afc0c269c3d20cde05515b00ede00e91fee0be5 (patch)
treed54e7fa59df16bb62902129dfd28956d9ae1be19 /arch/mips/include/asm/maar.h
parentMerge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/... (diff)
parentMerge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus (diff)
downloadlinux-6afc0c269c3d20cde05515b00ede00e91fee0be5.tar.xz
linux-6afc0c269c3d20cde05515b00ede00e91fee0be5.zip
Merge branch 'linus' into perf/core, to pick up fixes before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/mips/include/asm/maar.h')
-rw-r--r--arch/mips/include/asm/maar.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/mips/include/asm/maar.h b/arch/mips/include/asm/maar.h
index b02891f9caaf..21d9607c80d7 100644
--- a/arch/mips/include/asm/maar.h
+++ b/arch/mips/include/asm/maar.h
@@ -66,6 +66,15 @@ static inline void write_maar_pair(unsigned idx, phys_addr_t lower,
}
/**
+ * maar_init() - initialise MAARs
+ *
+ * Performs initialisation of MAARs for the current CPU, making use of the
+ * platforms implementation of platform_maar_init where necessary and
+ * duplicating the setup it provides on secondary CPUs.
+ */
+extern void maar_init(void);
+
+/**
* struct maar_config - MAAR configuration data
* @lower: The lowest address that the MAAR pair will affect. Must be
* aligned to a 2^16 byte boundary.