2012-01-26 18:16:21

by John W. Linville

[permalink] [raw]
Subject: [PATCH] compat: use kconfig.h in compat-2.6.h for 3.1 and later kernels

This file was introduced in commit 2a11c8ea20bf850b3a2c60db8c2e7497d28aba99
and included in 3.1 and later kernels. It includes <generated/autoconf.h>
itself, as well as some other definitions that are used elsewhere.

Signed-off-by: John W. Linville <[email protected]>
---
include/linux/compat-2.6.h | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/include/linux/compat-2.6.h b/include/linux/compat-2.6.h
index c23e94a..3ccd051 100644
--- a/include/linux/compat-2.6.h
+++ b/include/linux/compat-2.6.h
@@ -2,7 +2,9 @@
#define LINUX_26_COMPAT_H

#include <linux/version.h>
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0))
+#include <linux/kconfig.h>
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33))
#include <generated/autoconf.h>
#else
#include <linux/autoconf.h>
--
1.7.4.4



2012-02-01 08:17:38

by Alfonso Fiore

[permalink] [raw]
Subject: Re: [PATCH] compat: use kconfig.h in compat-2.6.h for 3.1 and later kernels

On Wed, Feb 1, 2012 at 8:10 AM, Luis R. Rodriguez <[email protected]> wrote:
> On Thu, Jan 26, 2012 at 10:00 AM, John W. Linville
> <[email protected]> wrote:
>> This file was introduced in commit 2a11c8ea20bf850b3a2c60db8c2e7497d28aba99
>> and included in 3.1 and later kernels. ?It includes <generated/autoconf.h>
>> itself, as well as some other definitions that are used elsewhere.
>>
>> Signed-off-by: John W. Linville <[email protected]>
>
> Apologies for the delay, and thanks a lot, applied and pushed!

Hi,

thank you.

how can I test this? I see the bleeding edge package has not been
update during the last seven days. Will it be updated soon or should I
test with git?

cheers,
alfonso

2012-02-01 07:10:47

by Luis R. Rodriguez

[permalink] [raw]
Subject: Re: [PATCH] compat: use kconfig.h in compat-2.6.h for 3.1 and later kernels

On Thu, Jan 26, 2012 at 10:00 AM, John W. Linville
<[email protected]> wrote:
> This file was introduced in commit 2a11c8ea20bf850b3a2c60db8c2e7497d28aba99
> and included in 3.1 and later kernels.  It includes <generated/autoconf.h>
> itself, as well as some other definitions that are used elsewhere.
>
> Signed-off-by: John W. Linville <[email protected]>

Apologies for the delay, and thanks a lot, applied and pushed!

Luis