aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/ftrace.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/kernel/ftrace.c')
-rw-r--r--arch/x86/kernel/ftrace.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c
index 3afb33f14d2d..b45246f9a640 100644
--- a/arch/x86/kernel/ftrace.c
+++ b/arch/x86/kernel/ftrace.c
@@ -167,9 +167,9 @@ static void ftrace_mod_code(void)
167 167
168void ftrace_nmi_enter(void) 168void ftrace_nmi_enter(void)
169{ 169{
170 __get_cpu_var(save_modifying_code) = modifying_code; 170 __this_cpu_write(save_modifying_code, modifying_code);
171 171
172 if (!__get_cpu_var(save_modifying_code)) 172 if (!__this_cpu_read(save_modifying_code))
173 return; 173 return;
174 174
175 if (atomic_inc_return(&nmi_running) & MOD_CODE_WRITE_FLAG) { 175 if (atomic_inc_return(&nmi_running) & MOD_CODE_WRITE_FLAG) {
@@ -183,7 +183,7 @@ void ftrace_nmi_enter(void)
183 183
184void ftrace_nmi_exit(void) 184void ftrace_nmi_exit(void)
185{ 185{
186 if (!__get_cpu_var(save_modifying_code)) 186 if (!__this_cpu_read(save_modifying_code))
187 return; 187 return;
188 188
189 /* Finish all executions before clearing nmi_running */ 189 /* Finish all executions before clearing nmi_running */