Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932806Ab1EXTto (ORCPT ); Tue, 24 May 2011 15:49:44 -0400 Received: from mail.perches.com ([173.55.12.10]:1977 "EHLO mail.perches.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932249Ab1EXTtl (ORCPT ); Tue, 24 May 2011 15:49:41 -0400 Subject: Re: linux-next: Tree for May 24 (ratelimits, CONFIG_PRINTK not enabled) From: Joe Perches To: David Miller Cc: randy.dunlap@oracle.com, sfr@canb.auug.org.au, netdev@vger.kernel.org, linux-next@vger.kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20110524.153222.1953796640575918161.davem@davemloft.net> References: <20110524140212.a4f19769.sfr@canb.auug.org.au> <20110524113328.e3d5867b.randy.dunlap@oracle.com> <1306262988.2298.49.camel@Joe-Laptop> <20110524.153222.1953796640575918161.davem@davemloft.net> Content-Type: text/plain; charset="UTF-8" Date: Tue, 24 May 2011 12:49:40 -0700 Message-ID: <1306266580.2298.55.camel@Joe-Laptop> Mime-Version: 1.0 X-Mailer: Evolution 2.32.2 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1702 Lines: 62 On Tue, 2011-05-24 at 15:32 -0400, David Miller wrote: > From: Joe Perches > Date: Tue, 24 May 2011 11:49:48 -0700 > > On Tue, 2011-05-24 at 11:33 -0700, Randy Dunlap wrote: > >> Adding to causes other problems: > > Yup, that's not a good solution. > Please come up with a fix or I'll have to revert, thanks Joe. I have some errands to run for awhile. Probably a revert today and another patch set tomorrow might be best. This seems to work and doesn't cause any extra state to be instantiated when !CONFIG_PRINTK. What do you think? #ifdef CONFIG_PRINTK #define WARN_ON_RATELIMIT(condition, state) \ WARN_ON((condition) && __ratelimit(state)) #define __WARN_RATELIMIT(condition, state, format...) \ ({ \ int rtn = 0; \ if (unlikely(__ratelimit(state))) \ rtn = WARN(condition, format); \ rtn; \ }) #define WARN_RATELIMIT(condition, format...) \ ({ \ static DEFINE_RATELIMIT_STATE(_rs, \ DEFAULT_RATELIMIT_INTERVAL, \ DEFAULT_RATELIMIT_BURST); \ __WARN_RATELIMIT(condition, &_rs, format); \ }) #else #define WARN_ON_RATELIMIT(condition, state) \ WARN_ON(condition) #define __WARN_RATELIMIT(condition, state, format...) \ ({ \ int rtn = WARN(condition, format); \ rtn; \ }) #define WARN_RATELIMIT(condition, format...) \ ({ \ int rtn = WARN(condition, format); \ rtn; \ }) #endif -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/