2010-11-12 16:53:18

by Felix Fietkau

Subject: [PATCH] compat: fix pm_qos_params compile error on 2.6.35

Linux 2.6.35 pm_qos_params.h is missing a #ifndef/define/endif around
its header file contents, causing a compile error when its functions
are overwritten by macros in the compat header files.
Fix this by adding these to the compat version of this header file.

Signed-off-by: Felix Fietkau <[email protected]>
---
--- a/include/linux/pm_qos_params.h
+++ b/include/linux/pm_qos_params.h
@@ -1,5 +1,8 @@
#include <linux/version.h>

+#ifndef __COMPAT_LINUX_PM_QOS_PARAMS_H
+#define __COMPAT_LINUX_PM_QOS_PARAMS_H
+
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25))
#include_next <linux/pm_qos_params.h>
#else
@@ -30,3 +33,4 @@ int pm_qos_add_notifier(int qos, struct notifier_block
*notifier);
int pm_qos_remove_notifier(int qos, struct notifier_block *notifier);
#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)) */

+#endif

2010-11-12 19:16:21

by Luis R. Rodriguez

Subject: Re: [PATCH v2] compat: fix pm_qos_params compile error on 2.6.35

On Fri, Nov 12, 2010 at 11:12 AM, Felix Fietkau <[email protected]> wrote:
> Linux 2.6.35 pm_qos_params.h is missing a #ifndef/define/endif around
> its header file contents, causing a compile error when its functions
> are overwritten by macros in the compat header files.
> Fix this by adding these to the compat version of this header file.
>
> Signed-off-by: Felix Fietkau <[email protected]>

Applied and pushed, thanks!

Luis

2010-11-12 19:13:02

by Felix Fietkau

Subject: [PATCH v2] compat: fix pm_qos_params compile error on 2.6.35

Linux 2.6.35 pm_qos_params.h is missing a #ifndef/define/endif around
its header file contents, causing a compile error when its functions
are overwritten by macros in the compat header files.
Fix this by adding these to the compat version of this header file.

Signed-off-by: Felix Fietkau <[email protected]>
---
--- a/include/linux/pm_qos_params.h
+++ b/include/linux/pm_qos_params.h
@@ -1,5 +1,8 @@
#include <linux/version.h>

+#ifndef __COMPAT_LINUX_PM_QOS_PARAMS_H
+#define __COMPAT_LINUX_PM_QOS_PARAMS_H
+
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25))
#include_next <linux/pm_qos_params.h>
#else
@@ -30,3 +33,4 @@ int pm_qos_add_notifier(int qos, struct notifier_block *notifier);
int pm_qos_remove_notifier(int qos, struct notifier_block *notifier);
#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,25)) */

+#endif

2011-01-07 20:41:36

by Jason Andryuk

Subject: Re: [PATCH v2] compat: fix pm_qos_params compile error on 2.6.35

On Fri, Nov 12, 2010 at 2:16 PM, Luis R. Rodriguez
<[email protected]> wrote:
> On Fri, Nov 12, 2010 at 11:12 AM, Felix Fietkau <[email protected]> wrote:
>> Linux 2.6.35 pm_qos_params.h is missing a #ifndef/define/endif around
>> its header file contents, causing a compile error when its functions
>> are overwritten by macros in the compat header files.
>> Fix this by adding these to the compat version of this header file.
>>
>> Signed-off-by: Felix Fietkau <[email protected]>
>
> Applied and pushed, thanks!
>
>  Luis

This patch is to compile compat-wireless-2.6.37-2-sn.tar.bz2 on Ubuntu
10.10 2.6.35-24-generic.

Jason