From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757584Ab0KRTCU (ORCPT ); Thu, 18 Nov 2010 14:02:20 -0500 Received: from mx3.mail.elte.hu ([157.181.1.138]:53930 "EHLO mx3.mail.elte.hu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757356Ab0KRTCT (ORCPT ); Thu, 18 Nov 2010 14:02:19 -0500 Date: Thu, 18 Nov 2010 20:02:05 +0100 From: Ingo Molnar To: Linus Torvalds Cc: Randy Dunlap , Linux Kernel Mailing List , Arnd Bergmann Subject: Re: [build failure] Re: BKL: remove extraneous #include Message-ID: <20101118190205.GB10827@elte.hu> References: <201011172159.oAHLx1tu001236@hera.kernel.org> <20101117140526.d532b373.randy.dunlap@oracle.com> <20101118094342.GA10382@elte.hu> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: User-Agent: Mutt/1.5.20 (2009-08-17) X-ELTE-SpamScore: -2.0 X-ELTE-SpamLevel: X-ELTE-SpamCheck: no X-ELTE-SpamVersion: ELTE 2.0 X-ELTE-SpamCheck-Details: score=-2.0 required=5.9 tests=BAYES_00 autolearn=no SpamAssassin version=3.2.5 -2.0 BAYES_00 BODY: Bayesian spam probability is 0 to 1% [score: 0.0000] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org * Linus Torvalds wrote: > On Thu, Nov 18, 2010 at 7:57 AM, Linus Torvalds > wrote: > > > > How painful would it be to move lock_depth into thread_struct? I guess > > we don't have anything that cares about structure offsets in assembly > > for that thing.  I should just try. > > Gaah, the only generic field there is the restart_block, so we'd have > to hide it there, or then add it to each architecture. So scratch > that. > > I guess this is the simplest approach. > > Linus > include/linux/hardirq.h | 1 + > 1 files changed, 1 insertions(+), 0 deletions(-) > > diff --git a/include/linux/hardirq.h b/include/linux/hardirq.h > index 714da7e..32f9fd6 100644 > --- a/include/linux/hardirq.h > +++ b/include/linux/hardirq.h > @@ -94,6 +94,7 @@ > #define in_nmi() (preempt_count() & NMI_MASK) > > #if defined(CONFIG_PREEMPT) && defined(CONFIG_BKL) > +# include > # define PREEMPT_INATOMIC_BASE (current->lock_depth >= 0) > #else > # define PREEMPT_INATOMIC_BASE 0 Hey, i will quote this patch in the future, when you flame me about some ugly compatibility hack ;-) I guess it will all go away with CONFIG_BKL so we dont really care so deeply. I'll test it. Thanks, Ingo