From patchwork Thu Aug 9 13:26:04 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Zefir Kurtisi X-Patchwork-Id: 1300751 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 5277DDFF7B for ; Thu, 9 Aug 2012 13:26:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754110Ab2HIN0P (ORCPT ); Thu, 9 Aug 2012 09:26:15 -0400 Received: from mail.neratec.com ([80.75.119.105]:33084 "EHLO mail.neratec.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752229Ab2HIN0O convert rfc822-to-8bit (ORCPT ); Thu, 9 Aug 2012 09:26:14 -0400 Received: from localhost (localhost [127.0.0.1]) by mail.neratec.com (Postfix) with ESMTP id 7B07A8A0483; Thu, 9 Aug 2012 15:26:04 +0200 (CEST) X-Virus-Scanned: amavisd-new at neratec.com Received: from mail.neratec.com ([127.0.0.1]) by localhost (mail.neratec.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id rv2Yq8X5zQZg; Thu, 9 Aug 2012 15:26:04 +0200 (CEST) Received: from mail.neratec.com (mail.neratec.com [192.168.11.23]) by mail.neratec.com (Postfix) with ESMTP id 16D458A25ED; Thu, 9 Aug 2012 15:26:04 +0200 (CEST) Date: Thu, 9 Aug 2012 15:26:04 +0200 (CEST) From: Zefir Kurtisi To: Andy Gospodarek Cc: Phil Perry , mcgrof@frijolero.org, lf driver backport , linux-wireless@vger.kernel.org Message-ID: <2121451356.93690.1344518764022.JavaMail.root@neratec.com> In-Reply-To: <1344487215-24143-1-git-send-email-andy@greyhouse.net> Subject: Re: [PATCH v2] compat: support RHEL6.3 as a build target MIME-Version: 1.0 X-Originating-IP: [192.168.11.104] X-Mailer: Zimbra 7.2.0_GA_2669 (ZimbraWebClient - FF3.0 (Linux)/7.2.0_GA_2669) Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org On 08/09/2012 06:40 AM, Andy Gospodarek wrote: > This patch allows me to compile and load the latest compat modules on > RHEL6.3. Users of compat on RHEL6 should note that you should set > CONFIG_COMPAT_KFIFO=n as those bits are not needed at all. > > [...] > > diff --git a/include/linux/compat-2.6.36.h b/include/linux/compat-2.6.36.h > index 56d5961..09e4b6f 100644 > --- a/include/linux/compat-2.6.36.h > +++ b/include/linux/compat-2.6.36.h > @@ -98,6 +98,8 @@ struct pm_qos_request_list { > * Dummy printk for disabled debugging statements to use whilst maintaining > * gcc's format and side-effect checking. > */ > +/* 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; } > > [...] This at least breaks compilation on 2.6.35-22 with gcc throwing a compat-2.6.36.h:104: error: ISO C requires a named argument before ‘...’ It looks like no_printk() needs to be renamed to compat_no_printk() to make it work as intended. This is a systematic mistake at several sections of this patch, where the original function needs to be prefixed by 'compat_' to match the related macro. --- -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/include/linux/compat-2.6.36.h b/include/linux/compat-2.6.36.h index 8b02260..b6757c3 100644 --- a/include/linux/compat-2.6.36.h +++ b/include/linux/compat-2.6.36.h @@ -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; } #ifndef alloc_workqueue #define alloc_workqueue(name, flags, max_active) __create_workqueue(name, flags, max_active, 0)