From mboxrd@z Thu Jan 1 00:00:00 1970 From: Randy Dunlap Subject: Re: [PATCH] Move an assert under DEBUG_KERNEL. (attempt 2) Date: Mon, 10 Jan 2011 09:19:59 -0800 Message-ID: <20110110091959.ff4a2bfe.randy.dunlap@oracle.com> References: <4D2579B2.7060704@parallels.com> <20110106154120.b69118c9.akpm@linux-foundation.org> <4D2AC4D5.5070503@parallels.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Cc: Andrew Morton , , , , netdev To: Rob Landley Return-path: In-Reply-To: <4D2AC4D5.5070503@parallels.com> Sender: linux-kernel-owner@vger.kernel.org List-Id: netdev.vger.kernel.org On Mon, 10 Jan 2011 02:35:33 -0600 Rob Landley wrote: > On 01/06/2011 05:41 PM, Andrew Morton wrote: > > Probably a worthwhile thing to do, IMO. If there's some net-specific > > CONFIG_DEBUG_ setting then that wold be a better thing to use. > > > > However the patch was a) wordwrapped, b) space-stuffed and c) not cc'ed > > to the networking list. So its prospects are dim. > > Ok, either I've beaten thunderbird into submission, or I'll be submitting a patch to Documentation/email-clients.txt. (Whether or not I need to find a different smtp server to send this through remains an open question.) > > (Confirming: I looked for a more specific DEBUG symbol, but couldn't find one. I can add one, but this seems a bit small to have its own symbol, and DEBUG_KERNEL is already used in a few *.c files.) > > From: Rob Landley > > Move an assert under DEBUG_KERNEL. (Minor cleanup to save a few bytes.) > > Signed-off-by: Rob Landley > --- > > include/linux/rtnetlink.h | 4 ++++ > 1 file changed, 4 insertions(+) Hm, cc to linux-net should be to netdev instead (so I changed it). > diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h > index bbad657..28c4025 100644 > --- a/include/linux/rtnetlink.h > +++ b/include/linux/rtnetlink.h > @@ -782,6 +782,7 @@ extern struct netdev_queue *dev_ingress_queue_create(struct net_device *dev); > extern void rtnetlink_init(void); > extern void __rtnl_unlock(void); > > +#ifdef CONFIG_DEBUG_KERNEL > #define ASSERT_RTNL() do { \ > if (unlikely(!rtnl_is_locked())) { \ > printk(KERN_ERR "RTNL: assertion failed at %s (%d)\n", \ > @@ -789,6 +790,9 @@ extern void __rtnl_unlock(void); > dump_stack(); \ > } \ > } while(0) > +#else > +#define ASSERT_RTNL() > +#endif Empty macros in Linux usually take the (preferred) form of this one from kernel.h: #define might_resched() do { } while (0) although it's up to DaveM in this case. > > static inline u32 rtm_get_table(struct rtattr **rta, u8 table) > { > -- --- ~Randy *** Remember to use Documentation/SubmitChecklist when testing your code ***