Return-path: Received: from mail-gg0-f174.google.com ([209.85.161.174]:57613 "EHLO mail-gg0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753387Ab2HJGFe (ORCPT ); Fri, 10 Aug 2012 02:05:34 -0400 Received: by ggdk6 with SMTP id k6so1286037ggd.19 for ; Thu, 09 Aug 2012 23:05:33 -0700 (PDT) MIME-Version: 1.0 In-Reply-To: <20120810031323.GE2384@quad.redhat.com> References: <1344487215-24143-1-git-send-email-andy@greyhouse.net> <2121451356.93690.1344518764022.JavaMail.root@neratec.com> <20120810031323.GE2384@quad.redhat.com> From: "Luis R. Rodriguez" Date: Thu, 9 Aug 2012 23:05:12 -0700 Message-ID: (sfid-20120810_080602_821688_204D7A29) Subject: Re: [Lf_driver_backport] [PATCH v2] compat: support RHEL6.3 as a build target To: Andy Gospodarek Cc: Zefir Kurtisi , linux-wireless@vger.kernel.org, lf driver backport , Andy Gospodarek Content-Type: text/plain; charset=UTF-8 Sender: linux-wireless-owner@vger.kernel.org List-ID: On Thu, Aug 9, 2012 at 8:13 PM, Andy Gospodarek wrote: > On Thu, Aug 09, 2012 at 06:27:25PM -0700, Luis R. Rodriguez wrote: >> On Thu, Aug 9, 2012 at 6:26 AM, Zefir Kurtisi wrote: >> > @@ -101,7 +101,7 @@ struct pm_qos_request_list { >> > /* mask no_printk as RHEL6 backports this */ >> > #define no_printk(...) compat_no_printk(...) >> > static inline __attribute__ ((format (printf, 1, 2))) >> > -int no_printk(const char *s, ...) { return 0; } >> > +int compat_no_printk(const char *s, ...) { return 0; } >> >> I merged this in. Andy can you review your other changes as Zefir points out? >> >> mcgrof@frijol ~/compat (git::master)$ gcc --version >> gcc (Debian 4.7.1-2) 4.7.1 >> Copyright (C) 2012 Free Software Foundation, Inc. >> This is free software; see the source for copying conditions. There is NO >> warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. >> >> I suppose we should get ckmake to spit out the version of gcc onto the report. >> >> Luis > > I did some more testing and I'm not sure I agree that the patch above is > the proper way to do this. My impression was that what I did was > correct as the only function definitions that need to be renamed with > the 'compat_' string in front were those that were exported. This is > what was done in both John Linville's initial patch for RHEL support and > the patch from Hauke Mehrtens for Debian Squeeze support. I feel like > this is the proper patch to fixup my original error: > > Subject: [PATCH] compat: fixup error in no_printk definition > > What initially looked like a valid definition for the #define for > no_printk was not. This corrects the problem. > > Signed-off-by: Andy Gospodarek > --- > include/linux/compat-2.6.36.h | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/include/linux/compat-2.6.36.h b/include/linux/compat-2.6.36.h > index 09e4b6f..cd5e37c 100644 > --- a/include/linux/compat-2.6.36.h > +++ b/include/linux/compat-2.6.36.h > @@ -99,7 +99,7 @@ struct pm_qos_request_list { > * gcc's format and side-effect checking. > */ > /* mask no_printk as RHEL6 backports this */ > -#define no_printk(...) compat_no_printk(...) > +#define no_printk(a, ...) compat_no_printk(a, ##__VA_ARGS__) > static inline __attribute__ ((format (printf, 1, 2))) > int no_printk(const char *s, ...) { return 0; } Thanks, can you git fetch ; git rebase and send a new patch? Luis