lkml.org 
[lkml]   [2010]   [Oct]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 2/2] x86: Remove stale TIF_DEBUG
    Date
    The last user was ptrace breakpoints, which doesn't use that
    since 2.6.33.

    Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
    Cc: Ingo Molnar <mingo@elte.hu>
    Cc: H. Peter Anvin <hpa@zytor.com>
    Cc: Thomas Gleixner <tglx@linutronix.de>
    ---
    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


    \
     
     \ /
      Last update: 2010-10-18 22:39    [W:0.025 / U:29.684 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site