1 files changed, 12 insertions, 4 deletions

diff --git a/arch/x86/kernel/kprobes.c b/arch/x86/kernel/kprobes.c
index b43bbaebe2c0..f2f56c0967b6 100644
--- a/arch/x86/kernel/kprobes.c
+++ b/arch/x86/kernel/kprobes.c
@@ -422,14 +422,22 @@ static void __kprobes set_current_kprobe(struct kprobe *p, struct pt_regs *regs,
 
 static void __kprobes clear_btf(void)
 {
-        if (test_thread_flag(TIF_DEBUGCTLMSR))
-                update_debugctlmsr(0);
+        if (test_thread_flag(TIF_BLOCKSTEP)) {
+                unsigned long debugctl = get_debugctlmsr();
+
+                debugctl &= ~DEBUGCTLMSR_BTF;
+                update_debugctlmsr(debugctl);
+        }
 }
 
 static void __kprobes restore_btf(void)
 {
-        if (test_thread_flag(TIF_DEBUGCTLMSR))
-                update_debugctlmsr(current->thread.debugctlmsr);
+        if (test_thread_flag(TIF_BLOCKSTEP)) {
+                unsigned long debugctl = get_debugctlmsr();
+
+                debugctl |= DEBUGCTLMSR_BTF;
+                update_debugctlmsr(debugctl);
+        }
 }
 
 void __kprobes arch_prepare_kretprobe(struct kretprobe_instance *ri,