compat: fix pm_qos_params compile error on 2.6.35
PATCH 1/1 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.
---
include/linux/pm_qos_params.h +3 -0
@@ -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
PATCH v2 1/1 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.
---
include/linux/pm_qos_params.h +4 -0
@@ -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
Quoted 6 lines · Felix Fietkau
Linux 2.6.35
pm_qos_params.his 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
Quoted 11 lines · Luis R. Rodriguez
Quoted 6 lines · Felix Fietkau
Linux 2.6.35
pm_qos_params.his 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