diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-01-30 07:33:12 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 07:33:12 -0500 |
commit | f13bd3e7935f7020f7c622bf3f8cae8eee757a53 (patch) | |
tree | 5930ec49601600b9eff35ca440a40b5a7320d357 /arch/x86/kernel/step.c | |
parent | e8c10ef9dde3ab7b7d7db6804859d9daf38f01c4 (diff) |
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.c | 4 |
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) | |||
229 | if (child != current) | 229 | if (child != current) |
230 | return; | 230 | return; |
231 | 231 | ||
232 | #ifdef CONFIG_X86_64 | ||
233 | wrmsrl(MSR_IA32_DEBUGCTLMSR, val); | 232 | wrmsrl(MSR_IA32_DEBUGCTLMSR, val); |
234 | #else | ||
235 | wrmsr(MSR_IA32_DEBUGCTLMSR, val, 0); | ||
236 | #endif | ||
237 | } | 233 | } |
238 | 234 | ||
239 | /* | 235 | /* |