* [PATCH] compat: fix pm_qos_params compile error on 2.6.35
@ 2010-11-12 16:53 Felix Fietkau
2010-11-12 19:12 ` [PATCH v2] " Felix Fietkau
0 siblings, 1 reply; 4+ messages in thread
From: Felix Fietkau @ 2010-11-12 16:53 UTC (permalink / raw)
To: linux-wireless; +Cc: Luis R. Rodriguez
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 <nbd@openwrt.org>
---
--- 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
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v2] compat: fix pm_qos_params compile error on 2.6.35
2010-11-12 16:53 [PATCH] compat: fix pm_qos_params compile error on 2.6.35 Felix Fietkau
@ 2010-11-12 19:12 ` Felix Fietkau
2010-11-12 19:16 ` Luis R. Rodriguez
0 siblings, 1 reply; 4+ messages in thread
From: Felix Fietkau @ 2010-11-12 19:12 UTC (permalink / raw)
To: linux-wireless; +Cc: Luis R. Rodriguez
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 <nbd@openwrt.org>
---
--- 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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2] compat: fix pm_qos_params compile error on 2.6.35
2010-11-12 19:12 ` [PATCH v2] " Felix Fietkau
@ 2010-11-12 19:16 ` Luis R. Rodriguez
2011-01-07 20:41 ` Jason Andryuk
0 siblings, 1 reply; 4+ messages in thread
From: Luis R. Rodriguez @ 2010-11-12 19:16 UTC (permalink / raw)
To: Felix Fietkau; +Cc: linux-wireless
On Fri, Nov 12, 2010 at 11:12 AM, Felix Fietkau <nbd@openwrt.org> 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 <nbd@openwrt.org>
Applied and pushed, thanks!
Luis
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2] compat: fix pm_qos_params compile error on 2.6.35
2010-11-12 19:16 ` Luis R. Rodriguez
@ 2011-01-07 20:41 ` Jason Andryuk
0 siblings, 0 replies; 4+ messages in thread
From: Jason Andryuk @ 2011-01-07 20:41 UTC (permalink / raw)
To: Luis R. Rodriguez; +Cc: Felix Fietkau, linux-wireless
On Fri, Nov 12, 2010 at 2:16 PM, Luis R. Rodriguez
<lrodriguez@atheros.com> wrote:
> On Fri, Nov 12, 2010 at 11:12 AM, Felix Fietkau <nbd@openwrt.org> 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 <nbd@openwrt.org>
>
> 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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-01-07 20:41 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-11-12 16:53 [PATCH] compat: fix pm_qos_params compile error on 2.6.35 Felix Fietkau
2010-11-12 19:12 ` [PATCH v2] " Felix Fietkau
2010-11-12 19:16 ` Luis R. Rodriguez
2011-01-07 20:41 ` Jason Andryuk
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).