Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755779AbZCKKuj (ORCPT ); Wed, 11 Mar 2009 06:50:39 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755298AbZCKKuO (ORCPT ); Wed, 11 Mar 2009 06:50:14 -0400 Received: from vervifontaine.sonytel.be ([80.88.33.193]:55054 "EHLO vervifontaine.sonycom.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755275AbZCKKuM (ORCPT ); Wed, 11 Mar 2009 06:50:12 -0400 Date: Wed, 11 Mar 2009 11:50:09 +0100 (CET) From: Geert Uytterhoeven To: Greg Banks cc: Jason Baron , Martin Schwidefsky , Stephen Rothwell , Greg KH , linux-next@vger.kernel.org, Herbert Xu , Linux Kernel Development Subject: Re: linux-next: driver-core tree build failure In-Reply-To: <49B78D60.2070402@sgi.com> Message-ID: References: <20090310192440.949884a1.sfr@canb.auug.org.au> <20090310145311.6bf9d9e9@skybase> <20090310170841.2257de86@skybase> <20090310200200.GB3091@redhat.com> <49B78D60.2070402@sgi.com> User-Agent: Alpine 2.00 (LRH 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=ISO-8859-1 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 5041 Lines: 135 On Wed, 11 Mar 2009, Greg Banks wrote: > Jason Baron wrote: > > On Tue, Mar 10, 2009 at 05:08:41PM +0100, Martin Schwidefsky wrote: > > > >> On Tue, 10 Mar 2009 16:29:50 +0100 (CET) > >> Geert Uytterhoeven wrote: > >> > >> > >>>> The same could be done with the problematic pr_fmt definition: > >>>> > >>>> #define pr_fmt(fmt) __func__ ": " fmt > >>>> > >>> No, that also doesn't work: > >>> > >>> | crypto/zlib.c:150: error: expected '}' before string constant > >>> | crypto/zlib.c:150: error: expected ')' before '__func__' > >>> | crypto/zlib.c:162: error: expected '}' before string constant > >>> | crypto/zlib.c:162: error: expected ')' before '__func__' > >>> | crypto/zlib.c:166: error: expected '}' before string constant > >>> | crypto/zlib.c:166: error: expected ')' before '__func__' > >>> | crypto/zlib.c:170: error: expected '}' before string constant > >>> | crypto/zlib.c:170: error: expected ')' before '__func__' > >>> > >>> > >>>>> BTW, Martin: Is `#define pr_fmt(fmt) "%s: " fmt, __func__' a valid and > >>>>> intended usage of your pr_fmt() infrastructure? > >>>>> > >>>> The indended use is a simple prefix to the format string. To paste an > >>>> additional parameter is an interesting use of the pr_fmt macro .. > >>>> > >>> Bummer, I was so happy I could do things like > >>> > >>> | #define pr_fmt(fmt) "%s:%u: " fmt, __func__, __LINE__ > >>> > >> Actually that seem like a nice thing to have. With the upstream version of > >> dynamic_pr_debug this works, there the format string is used only on a printk. > >> git commit 25b67b75587d43ff3f09ad88c03c70a38372d95d introduces the code > >> that pastes the format string to the _ddebug structure. > >> > >> > > > > hmmm...yeah, some macro magic in include/linux/dynamic_debug.h converts > > the 'fmt' arg into a series of strings. It doesn't look as pretty in the > > dynamic debug control file: > > > > crypto/zlib.c:333 [zlib]zlib_decompress_final - "\042%s: \042 > > \042avail_in %u, avail_out %u (consumed %u, produced %u)\n\042, > > __func__" > > > > with all those '\042' there, which are the '"' characters, but we > > probably could live with it. > > > > patch below. > > > > > > I think this patch does the same thing more cleanly. > > When CONFIG_DYNAMIC_DEBUG is enabled, allow callers of pr_debug() > to provide their own definition of pr_fmt() even if that definition > uses tricks like > > #define pr_fmt(fmt) "%s:" fmt, __func__ > > Signed-off-by: Greg Banks Thanks, much cleaner! Acked-by: Geert Uytterhoeven > --- > > include/linux/dynamic_debug.h | 4 ++-- > include/linux/kernel.h | 3 ++- > 2 files changed, 4 insertions(+), 3 deletions(-) > > Index: linux-git/include/linux/dynamic_debug.h > =================================================================== > --- linux-git.orig/include/linux/dynamic_debug.h > +++ linux-git/include/linux/dynamic_debug.h > @@ -57,7 +57,7 @@ extern int ddebug_remove_module(char *mo > { KBUILD_MODNAME, __func__, __FILE__, fmt, DEBUG_HASH, \ > DEBUG_HASH2, __LINE__, _DPRINTK_FLAGS_DEFAULT }; \ > if (__dynamic_dbg_enabled(descriptor)) \ > - printk(KERN_DEBUG KBUILD_MODNAME ":" fmt, \ > + printk(KERN_DEBUG KBUILD_MODNAME ":" pr_fmt(fmt), \ > ##__VA_ARGS__); \ > } while (0) > > @@ -70,7 +70,7 @@ extern int ddebug_remove_module(char *mo > DEBUG_HASH2, __LINE__, _DPRINTK_FLAGS_DEFAULT }; \ > if (__dynamic_dbg_enabled(descriptor)) \ > dev_printk(KERN_DEBUG, dev, \ > - KBUILD_MODNAME ": " fmt, \ > + KBUILD_MODNAME ": " pr_fmt(fmt),\ > ##__VA_ARGS__); \ > } while (0) > > Index: linux-git/include/linux/kernel.h > =================================================================== > --- linux-git.orig/include/linux/kernel.h > +++ linux-git/include/linux/kernel.h > @@ -359,8 +359,9 @@ static inline char *pack_hex_byte(char * > #define pr_debug(fmt, ...) \ > printk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__) > #elif defined(CONFIG_DYNAMIC_DEBUG) > +/* dynamic_pr_debug() uses pr_fmt() internally so we don't need it here */ > #define pr_debug(fmt, ...) do { \ > - dynamic_pr_debug(pr_fmt(fmt), ##__VA_ARGS__); \ > + dynamic_pr_debug(fmt, ##__VA_ARGS__); \ > } while (0) > #else > #define pr_debug(fmt, ...) \ With kind regards, Geert Uytterhoeven Software Architect Sony Techsoft Centre Europe The Corporate Village ? Da Vincilaan 7-D1 ? B-1935 Zaventem ? Belgium Phone: +32 (0)2 700 8453 Fax: +32 (0)2 700 8622 E-mail: Geert.Uytterhoeven@sonycom.com Internet: http://www.sony-europe.com/ A division of Sony Europe (Belgium) N.V. VAT BE 0413.825.160 ? RPR Brussels Fortis ? BIC GEBABEBB ? IBAN BE41293037680010 -- 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/