From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S932182AbbBBPew (ORCPT <rfc822;w@1wt.eu>);
	Mon, 2 Feb 2015 10:34:52 -0500
Received: from bombadil.infradead.org ([198.137.202.9]:60152 "EHLO
	bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1753915AbbBBPes (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Mon, 2 Feb 2015 10:34:48 -0500
Date: Mon, 2 Feb 2015 16:34:31 +0100
From: Peter Zijlstra <peterz@infradead.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Oleg Nesterov <oleg@redhat.com>, "Rafael J. Wysocki" <rjw@rjwysocki.net>,
        Ingo Molnar <mingo@kernel.org>,
        Peter Hurley <peter@hurleysoftware.com>,
        Davidlohr Bueso <dave@stgolabs.net>,
        Bruno =?iso-8859-1?Q?Pr=E9mont?= <bonbons@linux-vserver.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Thomas Gleixner <tglx@linutronix.de>,
        Ilya Dryomov <ilya.dryomov@inktank.com>,
        Mike Galbraith <umgwanakikbuti@gmail.com>
Subject: Re: Linux 3.19-rc5
Message-ID: <20150202153431.GF26304@twins.programming.kicks-ass.net>
References: <1421878320.4903.17.camel@stgolabs.net>
 <54C02E08.4080405@hurleysoftware.com>
 <1861286.x5DC37NGWz@vostro.rjw.lan>
 <CA+55aFzWGCO16v3NL7SqgBnQQrwpwCTvFZR=+3x89Hg0KzJtxg@mail.gmail.com>
 <CA+55aFxYo1fpVoGVXhA0VPNAKKEZPAQDpF47pk+yPSnArvDEdA@mail.gmail.com>
 <20150130154742.GA10547@redhat.com>
 <CA+55aFwW139HZ6aNi_2Jf36kx53znZMKS1QO_4JVXJJYsSG6=A@mail.gmail.com>
 <20150131201601.GZ2896@worktop.programming.kicks-ass.net>
 <20150201194306.GA29993@redhat.com>
 <CA+55aFw6JzP0uDAwVEvN_AhgSq8dpZ0BPC+YBdSHrS80iOLvbg@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <CA+55aFw6JzP0uDAwVEvN_AhgSq8dpZ0BPC+YBdSHrS80iOLvbg@mail.gmail.com>
User-Agent: Mutt/1.5.21 (2012-12-30)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Sun, Feb 01, 2015 at 12:09:32PM -0800, Linus Torvalds wrote:
> Now, I have the patch that removes that thing (but I was hoping to get
> it from the scheduler tree before doing rc7, which seems to not have
> happened), but yes, that together with your patch seems like it should
> fix all the nasty bug-inducing crud where the "debugging helpers" end
> up silently changing core process state.
> 
> I'll just combine it with yours to avoid extra noise in this area, and
> mark you as the author, fixing *both* of the incorrect state changes.
> Ok?

Ah I see it in your tree; I was about to suggest:

-# define sched_annotate_sleep()        __set_current_state(TASK_RUNNING)
+# define sched_annotate_sleep()        do { current->task_state_change = 0; } while (0)

Instead of the assignment, which has a rvalue.