From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754226Ab1DDNoi (ORCPT ); Mon, 4 Apr 2011 09:44:38 -0400 Received: from mail-qy0-f181.google.com ([209.85.216.181]:41702 "EHLO mail-qy0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754104Ab1DDNog (ORCPT ); Mon, 4 Apr 2011 09:44:36 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlemail.com; s=gamma; h=mime-version:reply-to:in-reply-to:references:date:message-id :subject:from:to:cc:content-type; b=NBXMf6hai8w+bsyEN0oRH8adoPO39Z9H6Zw9Lo1jPaeW9G8FX4xIDspNLm97MVt8Hi //I79aOaG9Qm5vwYJ3GzRYq1M98lmEA/CqGIUMgIt0N7Ff2hkj5E+1e2un9TVdaxurN+ yzzG7K+z6gMwWe8muTgO8ZPD6Z+Yl4twJ66lU= MIME-Version: 1.0 Reply-To: sedat.dilek@gmail.com In-Reply-To: <20110404130036.GB16669@srcf.ucam.org> References: <20110404122225.GA15883@srcf.ucam.org> <1301921369.1941.29.camel@Joe-Laptop> <20110404130036.GB16669@srcf.ucam.org> Date: Mon, 4 Apr 2011 15:44:34 +0200 Message-ID: Subject: Re: linux-next: Tree for April 4 [BROKEN thinkpad_acpi] From: Sedat Dilek To: Matthew Garrett Cc: Joe Perches , Stephen Rothwell , linux-next@vger.kernel.org, LKML , platform-driver-x86 , ibm-acpi@hmh.eng.br Content-Type: multipart/mixed; boundary=20cf3020746ac904d304a017f55f Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --20cf3020746ac904d304a017f55f Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On Mon, Apr 4, 2011 at 3:00 PM, Matthew Garrett wrote: > On Mon, Apr 04, 2011 at 05:49:29AM -0700, Joe Perches wrote: > >> 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...) =C2=A0 =C2=A0 =C2=A0\ >> =C2=A0 =C2=A0 =C2=A0 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? > > I don't. Henrique? > > -- > Matthew Garrett | mjg59@srcf.ucam.org > I have tried with solution #2 as it partially restores old behaviour (patch is attached). - Sedat - --20cf3020746ac904d304a017f55f Content-Type: text/x-patch; charset=US-ASCII; name="thinkpad_acpi-fix.patch" Content-Disposition: attachment; filename="thinkpad_acpi-fix.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_gm3ga9rf0 ZGlmZiAtLWdpdCBhL2RyaXZlcnMvcGxhdGZvcm0veDg2L3RoaW5rcGFkX2FjcGkuYyBiL2RyaXZl cnMvcGxhdGZvcm0veDg2L3RoaW5rcGFkX2FjcGkuYwppbmRleCBkOGYzZTY1Li45ODNlNDJmIDEw MDY0NAotLS0gYS9kcml2ZXJzL3BsYXRmb3JtL3g4Ni90aGlua3BhZF9hY3BpLmMKKysrIGIvZHJp dmVycy9wbGF0Zm9ybS94ODYvdGhpbmtwYWRfYWNwaS5jCkBAIC0zOTEsNyArMzkxLDcgQEAgZG8g ewkJCQkJCQkJCVwKIHN0YXRpYyBjb25zdCBjaGFyICpzdHJfc3VwcG9ydGVkKGludCBpc19zdXBw b3J0ZWQpOwogI2Vsc2UKICNkZWZpbmUgdmRiZ19wcmludGsoYV9kYmdfbGV2ZWwsIGZvcm1hdCwg YXJnLi4uKQlcCi0Jbm9fcHJpbnRrKGZvcm1hdCwgIyNhcmcpCisJZG8geyB9IHdoaWxlICgwKQog I2VuZGlmCiAKIHN0YXRpYyB2b2lkIHRwYWNwaV9sb2dfdXNlcnRhc2soY29uc3QgY2hhciAqIGNv bnN0IHdoYXQpCg== --20cf3020746ac904d304a017f55f--