From 875563ffeeb96a4557fbd5c398f38ff5bbefe5a0 Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Wed, 5 Mar 2008 08:36:48 +0000 Subject: [PATCH] --- yaml --- r: 87026 b: refs/heads/master c: d032b31a3a22a571cb50c0b5dffbe9ba9328d6e2 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/step.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 341bb7573988..28ae1e55a977 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 609b5297bcfb7b39b7a4137e9ec48407a8c96763 +refs/heads/master: d032b31a3a22a571cb50c0b5dffbe9ba9328d6e2 diff --git a/trunk/arch/x86/kernel/step.c b/trunk/arch/x86/kernel/step.c index 2ef1a5f8d675..9d406cdc847f 100644 --- a/trunk/arch/x86/kernel/step.c +++ b/trunk/arch/x86/kernel/step.c @@ -166,7 +166,7 @@ static void enable_step(struct task_struct *child, bool block) child->thread.debugctlmsr | DEBUGCTLMSR_BTF); } else { write_debugctlmsr(child, - child->thread.debugctlmsr & ~TIF_DEBUGCTLMSR); + child->thread.debugctlmsr & ~DEBUGCTLMSR_BTF); if (!child->thread.debugctlmsr) clear_tsk_thread_flag(child, TIF_DEBUGCTLMSR); @@ -189,7 +189,7 @@ void user_disable_single_step(struct task_struct *child) * Make sure block stepping (BTF) is disabled. */ write_debugctlmsr(child, - child->thread.debugctlmsr & ~TIF_DEBUGCTLMSR); + child->thread.debugctlmsr & ~DEBUGCTLMSR_BTF); if (!child->thread.debugctlmsr) clear_tsk_thread_flag(child, TIF_DEBUGCTLMSR);