From a54e30dc4493d84f95d63f03b6511ae96fdd5df5 Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Mon, 11 Jan 2010 17:13:31 -0800 Subject: [PATCH] Move pm-qos backport comments to 2.6.25 compat header We'll be synching the pm-qos implementation to match upstream pm-qos on linux-next. Signed-off-by: Luis R. Rodriguez --- compat/pm_qos_params.c | 18 ------------------ include/linux/compat-2.6.25.h | 22 ++++++++++++++++++++++ 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/compat/pm_qos_params.c b/compat/pm_qos_params.c index da93e957b8fe..5ce3d0b16374 100644 --- a/compat/pm_qos_params.c +++ b/compat/pm_qos_params.c @@ -5,24 +5,6 @@ #include -/* - * Backport work for QoS dependencies (kernel/pm_qos_params.c) - * pm-qos stuff written by mark gross mgross@linux.intel.com. - * - * ipw2100 now makes use of - * pm_qos_add_requirement(), - * pm_qos_update_requirement() and - * pm_qos_remove_requirement() from it - * - * mac80211 uses the network latency to determine if to enable or not - * dynamic PS. mac80211 also and registers a notifier for when - * the latency changes. Since older kernels do no thave pm-qos stuff - * we just implement it completley here and register it upon cfg80211 - * init. I haven't tested ipw2100 on 2.6.24 though. - * - * This is copied from the kernel written by mark gross mgross@linux.intel.com - */ - /* * locking rule: all changes to target_value or requirements or notifiers lists * or pm_qos_object list and pm_qos_objects need to happen with pm_qos_lock diff --git a/include/linux/compat-2.6.25.h b/include/linux/compat-2.6.25.h index a4d5c90849fc..c188f369aafc 100644 --- a/include/linux/compat-2.6.25.h +++ b/include/linux/compat-2.6.25.h @@ -17,6 +17,28 @@ #include #include +/* + * Backport work for QoS dependencies (kernel/pm_qos_params.c) + * pm-qos stuff written by mark gross mgross@linux.intel.com. + * + * ipw2100 now makes use of: + * + * pm_qos_add_requirement(), + * pm_qos_update_requirement() and + * pm_qos_remove_requirement() from it + * + * mac80211 uses the network latency to determine if to enable or not + * dynamic PS. mac80211 also and registers a notifier for when + * the latency changes. Since older kernels do no thave pm-qos stuff + * we just implement it completley here and register it upon cfg80211 + * init. I haven't tested ipw2100 on 2.6.24 though. + * + * This pm-qos implementation is copied verbatim from the kernel + * written by mark gross mgross@linux.intel.com. You don't have + * to do anythinig to use pm-qos except use the same exported + * routines as used in newer kernels. The compat_pm_qos_power_init() + * defned below is used by the compat module to initialize pm-qos. + */ int compat_pm_qos_power_init(void); /* -- 2.30.2