summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/step.c
diff options
context:
space:
mode:
authorHarvey Harrison <harvey.harrison@gmail.com>2008-01-30 13:33:12 +0100
committerIngo Molnar <mingo@elte.hu>2008-01-30 13:33:12 +0100
commitf13bd3e7935f7020f7c622bf3f8cae8eee757a53 (patch)
tree5930ec49601600b9eff35ca440a40b5a7320d357 /arch/x86/kernel/step.c
parente8c10ef9dde3ab7b7d7db6804859d9daf38f01c4 (diff)
downloadlinux-stable-f13bd3e7935f7020f7c622bf3f8cae8eee757a53.tar.gz
linux-stable-f13bd3e7935f7020f7c622bf3f8cae8eee757a53.tar.bz2
linux-stable-f13bd3e7935f7020f7c622bf3f8cae8eee757a53.zip
x86: use wrmsrl in kprobes.c, step.c
Where x86_32 passed zero in the high 32 bits, use wrmsrl which will zero extend for us. This allows ifdefs for 32/64 bit to be eliminated. Eliminate ifdef in step.c. Similar cleanup was done when unifying kprobes_32|64.c and wrmsr() was chosen there over wrmsrl(). This patch changes these to wrmsrl. Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/kernel/step.c')
-rw-r--r--arch/x86/kernel/step.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/x86/kernel/step.c b/arch/x86/kernel/step.c
index 5884dd485db8..b801e76cebf7 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
}
/*