projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'armsoc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[cascardo/linux.git]
/
arch
/
sh
/
kernel
/
ftrace.c
diff --git
a/arch/sh/kernel/ftrace.c
b/arch/sh/kernel/ftrace.c
index
95eccd4
..
5378397
100644
(file)
--- a/
arch/sh/kernel/ftrace.c
+++ b/
arch/sh/kernel/ftrace.c
@@
-139,7
+139,7
@@
static void ftrace_mod_code(void)
clear_mod_flag();
}
clear_mod_flag();
}
-void ftrace_nmi_enter(void)
+void
arch_
ftrace_nmi_enter(void)
{
if (atomic_inc_return(&nmi_running) & MOD_CODE_WRITE_FLAG) {
smp_rmb();
{
if (atomic_inc_return(&nmi_running) & MOD_CODE_WRITE_FLAG) {
smp_rmb();
@@
-150,7
+150,7
@@
void ftrace_nmi_enter(void)
smp_mb();
}
smp_mb();
}
-void ftrace_nmi_exit(void)
+void
arch_
ftrace_nmi_exit(void)
{
/* Finish all executions before clearing nmi_running */
smp_mb();
{
/* Finish all executions before clearing nmi_running */
smp_mb();