summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2016-10-18 03:24:42 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2016-10-18 03:24:41 -0700
commit02821f198dec1a1494f557e88a2d51a64f2fca2d (patch)
tree88ac58b5bcdc1fd8c268bb9b759d48c649a5941b /arch
parentff02182ddbef96019006158eabd6004811da6e72 (diff)
parent448971ccea4486e2f54caf9b6cd784c9d470087a (diff)
Merge "arm64: mm: Log the process id in the rtb"
Diffstat (limited to 'arch')
-rw-r--r--arch/arm64/include/asm/mmu_context.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm64/include/asm/mmu_context.h b/arch/arm64/include/asm/mmu_context.h
index 24165784b803..32441df2270e 100644
--- a/arch/arm64/include/asm/mmu_context.h
+++ b/arch/arm64/include/asm/mmu_context.h
@@ -27,19 +27,24 @@
#include <asm-generic/mm_hooks.h>
#include <asm/cputype.h>
#include <asm/pgtable.h>
+#include <linux/msm_rtb.h>
#ifdef CONFIG_PID_IN_CONTEXTIDR
static inline void contextidr_thread_switch(struct task_struct *next)
{
+ pid_t pid = task_pid_nr(next);
asm(
" msr contextidr_el1, %0\n"
" isb"
:
- : "r" (task_pid_nr(next)));
+ : "r" (pid));
+ uncached_logk(LOGK_CTXID, (void *)(u64)pid);
+
}
#else
static inline void contextidr_thread_switch(struct task_struct *next)
{
+ uncached_logk(LOGK_CTXID, (void *)(u64)task_pid_nr(next));
}
#endif