From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933283Ab0JRUg3 (ORCPT ); Mon, 18 Oct 2010 16:36:29 -0400 Received: from mail-gy0-f174.google.com ([209.85.160.174]:62239 "EHLO mail-gy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933157Ab0JRUg2 (ORCPT ); Mon, 18 Oct 2010 16:36:28 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:x-mailer-version :in-reply-to:references; b=UYj++jGdcZy/+is2pju51fz1u8a0DoDzCUaRL/TP18yc6a9mdAVcU3ELAHFWTkg3E8 6XHZk4xZX5+IPVFTrSjYZLemAPbW9dDJ/tJuRtOeqU/uYs+p0FfHiTijWek6xRox/zwe CxHSPNK7JATLJStkmI6HqNRCmqeQD8SCcjExg= From: Frederic Weisbecker To: LKML Cc: LKML , Frederic Weisbecker , Ingo Molnar , "H. Peter Anvin" , Thomas Gleixner Subject: [PATCH 2/2] x86: Remove stale TIF_DEBUG Date: Mon, 18 Oct 2010 22:35:58 +0200 Message-Id: <1287434158-24362-2-git-send-regression-fweisbec@gmail.com> X-Mailer: git-send-regression X-Mailer-version: 0.1, "The maintainer couldn't reproduce after one week full time debugging" special version. In-Reply-To: <1287434158-24362-1-git-send-regression-fweisbec@gmail.com> References: <1287434158-24362-1-git-send-regression-fweisbec@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The last user was ptrace breakpoints, which doesn't use that since 2.6.33. Signed-off-by: Frederic Weisbecker Cc: Ingo Molnar Cc: H. Peter Anvin Cc: Thomas Gleixner --- arch/x86/include/asm/thread_info.h | 15 ++++++--------- arch/x86/kernel/process_32.c | 2 +- arch/x86/kernel/process_64.c | 2 +- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h index 0bbf6f9..445cf3c 100644 --- a/arch/x86/include/asm/thread_info.h +++ b/arch/x86/include/asm/thread_info.h @@ -88,13 +88,12 @@ struct thread_info { #define TIF_IA32 17 /* 32bit process */ #define TIF_FORK 18 /* ret_from_fork */ #define TIF_MEMDIE 19 /* is terminating due to OOM killer */ -#define TIF_DEBUG 20 /* uses debug registers */ -#define TIF_IO_BITMAP 21 /* uses I/O bitmap */ -#define TIF_FREEZE 22 /* is freezing for suspend */ -#define TIF_FORCED_TF 23 /* true if TF in eflags artificially */ -#define TIF_BLOCKSTEP 24 /* set when we want DEBUGCTLMSR_BTF */ -#define TIF_LAZY_MMU_UPDATES 25 /* task is updating the mmu lazily */ -#define TIF_SYSCALL_TRACEPOINT 26 /* syscall tracepoint instrumentation */ +#define TIF_IO_BITMAP 20 /* uses I/O bitmap */ +#define TIF_FREEZE 21 /* is freezing for suspend */ +#define TIF_FORCED_TF 22 /* true if TF in eflags artificially */ +#define TIF_BLOCKSTEP 23 /* set when we want DEBUGCTLMSR_BTF */ +#define TIF_LAZY_MMU_UPDATES 24 /* task is updating the mmu lazily */ +#define TIF_SYSCALL_TRACEPOINT 25 /* syscall tracepoint instrumentation */ #define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE) #define _TIF_NOTIFY_RESUME (1 << TIF_NOTIFY_RESUME) @@ -110,7 +109,6 @@ struct thread_info { #define _TIF_NOTSC (1 << TIF_NOTSC) #define _TIF_IA32 (1 << TIF_IA32) #define _TIF_FORK (1 << TIF_FORK) -#define _TIF_DEBUG (1 << TIF_DEBUG) #define _TIF_IO_BITMAP (1 << TIF_IO_BITMAP) #define _TIF_FREEZE (1 << TIF_FREEZE) #define _TIF_FORCED_TF (1 << TIF_FORCED_TF) @@ -148,7 +146,6 @@ struct thread_info { (_TIF_IO_BITMAP|_TIF_NOTSC|_TIF_BLOCKSTEP) #define _TIF_WORK_CTXSW_PREV (_TIF_WORK_CTXSW|_TIF_USER_RETURN_NOTIFY) -#define _TIF_WORK_CTXSW_NEXT (_TIF_WORK_CTXSW|_TIF_DEBUG) #define PREEMPT_ACTIVE 0x10000000 diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c index 96586c3..44726fb 100644 --- a/arch/x86/kernel/process_32.c +++ b/arch/x86/kernel/process_32.c @@ -350,7 +350,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p) * Now maybe handle debug registers and/or IO bitmaps */ if (unlikely(task_thread_info(prev_p)->flags & _TIF_WORK_CTXSW_PREV || - task_thread_info(next_p)->flags & _TIF_WORK_CTXSW_NEXT)) + task_thread_info(next_p)->flags & _TIF_WORK_CTXSW)) __switch_to_xtra(prev_p, next_p, tss); /* If we're going to preload the fpu context, make sure clts diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c index b3d7a3a..399760d 100644 --- a/arch/x86/kernel/process_64.c +++ b/arch/x86/kernel/process_64.c @@ -484,7 +484,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p) /* * Now maybe reload the debug registers and handle I/O bitmaps */ - if (unlikely(task_thread_info(next_p)->flags & _TIF_WORK_CTXSW_NEXT || + if (unlikely(task_thread_info(next_p)->flags & _TIF_WORK_CTXSW || task_thread_info(prev_p)->flags & _TIF_WORK_CTXSW_PREV)) __switch_to_xtra(prev_p, next_p, tss); -- 1.6.2.3