From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from youngberry.canonical.com ([91.189.89.112]:48012 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751771AbbKBV1m (ORCPT ); Mon, 2 Nov 2015 16:27:42 -0500 Date: Mon, 2 Nov 2015 21:27:25 +0000 From: Luis Henriques To: Mike Galbraith Cc: gregkh@linuxfoundation.org, khlebnikov@yandex-team.ru, agraf@suse.de, boris.ostrovsky@oracle.com, david.vrabel@citrix.com, mingo@kernel.org, paulus@samba.org, peterz@infradead.org, tglx@linutronix.de, torvalds@linux-foundation.org, stable@vger.kernel.org Subject: Re: FAILED: patch "[PATCH] sched/preempt: Fix cond_resched_lock() and" failed to apply to 4.1-stable tree Message-ID: <20151102212725.GA3784@hercules> References: <144512946511183@kroah.com> <1445143459.2876.4.camel@gmx.de> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1445143459.2876.4.camel@gmx.de> Sender: stable-owner@vger.kernel.org List-ID: On Sun, Oct 18, 2015 at 06:44:19AM +0200, Mike Galbraith wrote: > Depends on 90b62b5129d5cb50f62f40e684de7a1961e57197. Rather than munge > the patch, take the dependency. > Thanks Mike, I'll queue these for this for the 3.16 kernel as well. Cheers, -- Lu�s > From 90b62b5129d5cb50f62f40e684de7a1961e57197 Mon Sep 17 00:00:00 2001 > From: Frederic Weisbecker > Date: Tue, 12 May 2015 16:41:48 +0200 > Subject: sched/preempt: Rename PREEMPT_CHECK_OFFSET to PREEMPT_DISABLE_OFFSET > > "CHECK" suggests it's only used as a comparison mask. But now it's used > further as a config-conditional preempt disabler offset. Lets > disambiguate this name. > > Signed-off-by: Frederic Weisbecker > Signed-off-by: Peter Zijlstra (Intel) > Cc: Linus Torvalds > Cc: Peter Zijlstra > Cc: Thomas Gleixner > Link: http://lkml.kernel.org/r/1431441711-29753-4-git-send-email-fweisbec@gmail.com > Signed-off-by: Ingo Molnar > Signed-off-by: Mike Galbraith > --- > include/linux/preempt_mask.h | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > --- a/include/linux/preempt_mask.h > +++ b/include/linux/preempt_mask.h > @@ -72,9 +72,9 @@ > #define in_nmi() (preempt_count() & NMI_MASK) > > #if defined(CONFIG_PREEMPT_COUNT) > -# define PREEMPT_CHECK_OFFSET 1 > +# define PREEMPT_DISABLE_OFFSET 1 > #else > -# define PREEMPT_CHECK_OFFSET 0 > +# define PREEMPT_DISABLE_OFFSET 0 > #endif > > /* > @@ -90,7 +90,7 @@ > * > * Work as expected. > */ > -#define SOFTIRQ_LOCK_OFFSET (SOFTIRQ_DISABLE_OFFSET + PREEMPT_CHECK_OFFSET) > +#define SOFTIRQ_LOCK_OFFSET (SOFTIRQ_DISABLE_OFFSET + PREEMPT_DISABLE_OFFSET) > > /* > * Are we running in atomic context? WARNING: this macro cannot > @@ -106,7 +106,7 @@ > * (used by the scheduler, *after* releasing the kernel lock) > */ > #define in_atomic_preempt_off() \ > - ((preempt_count() & ~PREEMPT_ACTIVE) != PREEMPT_CHECK_OFFSET) > + ((preempt_count() & ~PREEMPT_ACTIVE) != PREEMPT_DISABLE_OFFSET) > > #ifdef CONFIG_PREEMPT_COUNT > # define preemptible() (preempt_count() == 0 && !irqs_disabled()) > > > > > -- > To unsubscribe from this list: send the line "unsubscribe stable" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html