From 4964766c918cbde6e4520ded6e06039b1e0fec2d Mon Sep 17 00:00:00 2001 From: Harvey Harrison Date: Wed, 30 Jan 2008 13:33:12 +0100 Subject: [PATCH] --- yaml --- r: 80285 b: refs/heads/master c: f13bd3e7935f7020f7c622bf3f8cae8eee757a53 h: refs/heads/master i: 80283: 48eaf9cc5ce7a11b60d329d86639f0ebc03955d0 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/kprobes.c | 4 ++-- trunk/arch/x86/kernel/step.c | 4 ---- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 3e8bef7749e3..afbe8b64908b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e8c10ef9dde3ab7b7d7db6804859d9daf38f01c4 +refs/heads/master: f13bd3e7935f7020f7c622bf3f8cae8eee757a53 diff --git a/trunk/arch/x86/kernel/kprobes.c b/trunk/arch/x86/kernel/kprobes.c index 93aff49798ee..edc0a8e59247 100644 --- a/trunk/arch/x86/kernel/kprobes.c +++ b/trunk/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/trunk/arch/x86/kernel/step.c b/trunk/arch/x86/kernel/step.c index 5884dd485db8..b801e76cebf7 100644 --- a/trunk/arch/x86/kernel/step.c +++ b/trunk/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 } /*