Return-path: Received: from mail-iw0-f174.google.com ([209.85.214.174]:63306 "EHLO mail-iw0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754879Ab0KVBgR convert rfc822-to-8bit (ORCPT ); Sun, 21 Nov 2010 20:36:17 -0500 Received: by iwn34 with SMTP id 34so2239216iwn.19 for ; Sun, 21 Nov 2010 17:36:17 -0800 (PST) MIME-Version: 1.0 In-Reply-To: <20101110222448.GG4667@tux> References: <1289355626-25373-1-git-send-email-lacombar@gmail.com> <1289355626-25373-29-git-send-email-lacombar@gmail.com> <20101110222448.GG4667@tux> Date: Sun, 21 Nov 2010 20:36:17 -0500 Message-ID: Subject: Re: [PATCH 28/44] compat: avoid using `#include_next' directive in compat headers From: Arnaud Lacombe To: "Luis R. Rodriguez" Cc: "linux-wireless@vger.kernel.org" , Luis Rodriguez Content-Type: text/plain; charset=ISO-8859-1 Sender: linux-wireless-owner@vger.kernel.org List-ID: Hi, On Wed, Nov 10, 2010 at 5:24 PM, Luis R. Rodriguez wrote: > On Tue, Nov 09, 2010 at 06:20:10PM -0800, Arnaud Lacombe wrote: >> Signed-off-by: Arnaud Lacombe >> --- >> ?include/linux/pm_qos_params.h | ? ?7 +++---- >> ?include/linux/tracepoint.h ? ?| ? 14 +++++++------- >> ?include/net/net_namespace.h ? | ? 14 +++++++------- >> ?include/trace/define_trace.h ?| ? ?5 ----- >> ?4 files changed, 17 insertions(+), 23 deletions(-) >> >> diff --git a/include/linux/pm_qos_params.h b/include/linux/pm_qos_params.h >> index e1f083c..8c69ab2 100644 >> --- a/include/linux/pm_qos_params.h >> +++ b/include/linux/pm_qos_params.h >> @@ -1,8 +1,7 @@ >> ?#include >> >> -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)) >> -#include_next >> -#else >> +#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)) >> + > > But will the kernels' own pm_qos_params.h be included for kernels >= 2.6.25? > The compat headers should be at the end of the include list, so that the kernel headers get included first, and the compat one will only be when the kernel does not provide the header. This is the only sane way to override kernel provided stuff. That said, there is certainly a use-case I missed. - Arnaud