diff --git a/[refs] b/[refs] index 80317daed742..eec7e3d792bc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f6e0eba1b133192e298052d616e9e17356d32517 +refs/heads/master: 2f4aaf53c21e644ba0f581ce62b985d767388c64 diff --git a/trunk/arch/x86/kernel/process_64.c b/trunk/arch/x86/kernel/process_64.c index f91521e26335..836a71adfa11 100644 --- a/trunk/arch/x86/kernel/process_64.c +++ b/trunk/arch/x86/kernel/process_64.c @@ -608,10 +608,6 @@ static inline void __switch_to_xtra(struct task_struct *prev_p, memset(tss->io_bitmap, 0xff, prev->io_bitmap_max); } - /* - * Last branch recording recofiguration of trace hardware and - * disentangling of trace data per task. - */ if (test_tsk_thread_flag(prev_p, TIF_BTS_TRACE_TS)) ptrace_bts_take_timestamp(prev_p, BTS_TASK_DEPARTS);