Re: linux-next: Tree for April 4 [BROKEN thinkpad_acpi]

From: Joe Perches
Date: Mon Apr 04 2011 - 08:49:34 EST


On Mon, 2011-04-04 at 13:22 +0100, Matthew Garrett wrote:
> On Mon, Apr 04, 2011 at 11:21:43AM +0200, Sedat Dilek wrote:
> > My build breaked today.
> > Looks like the issue was introduced by commit
> > 2af915b1eda9a671973256540035f8a6da1d57b4:
> > "thinkpad_acpi: Convert printks to pr_<level>"
> Yes, this seems to break the non-debug case. Joe, can you take a look?

Sorry 'bout that. I only compiled it allyesconfig.

It's vdbg_printk no_printk verification.

#ifdef CONFIG_THINKPAD_ACPI_DEBUG
#define vdbg_printk dbg_printk
static const char *str_supported(int is_supported);
#else
#define vdbg_printk(a_dbg_level, format, arg...) \
no_printk(format, ##arg)
#endif

Two ways to handle this.

1: add
static inline const char *str_supported(int is_supported) { return ""; }
to the #else

2: Remove no_printk verification and return it to do {} while (0)

Do you have a preference?

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/