2 files changed, 2 insertions, 6 deletions

diff --git a/arch/x86/kernel/kprobes.c b/arch/x86/kernel/kprobes.c
index 93aff49798e..edc0a8e5924 100644
--- a/arch/x86/kernel/kprobes.c
+++ b/arch/x86/kernel/kprobes.c
@@ -410,13 +410,13 @@ 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))
-                wrmsr(MSR_IA32_DEBUGCTLMSR, 0, 0);
+                wrmsrl(MSR_IA32_DEBUGCTLMSR, 0);
 }
 
 static void __kprobes restore_btf(void)
 {
         if (test_thread_flag(TIF_DEBUGCTLMSR))
-                wrmsr(MSR_IA32_DEBUGCTLMSR, current->thread.debugctlmsr, 0);
+                wrmsrl(MSR_IA32_DEBUGCTLMSR, current->thread.debugctlmsr);
 }
 
 static void __kprobes prepare_singlestep(struct kprobe *p, struct pt_regs *regs)
diff --git a/arch/x86/kernel/step.c b/arch/x86/kernel/step.c
index 5884dd485db..b801e76cebf 100644
--- a/arch/x86/kernel/step.c
+++ b/arch/x86/kernel/step.c
@@ -229,11 +229,7 @@ static void write_debugctlmsr(struct task_struct *child, unsigned long val)
         if (child != current)
                 return;
 
-#ifdef CONFIG_X86_64
         wrmsrl(MSR_IA32_DEBUGCTLMSR, val);
-#else
-        wrmsr(MSR_IA32_DEBUGCTLMSR, val, 0);
-#endif
 }
 
 /*