[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20110614124510.e716bff1.randy.dunlap@oracle.com>
Date: Tue, 14 Jun 2011 12:45:10 -0700
From: Randy Dunlap <randy.dunlap@...cle.com>
To: Linus Torvalds <torvalds@...ux-foundation.org>, len.brown@...el.com
Cc: Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
Andy Whitcroft <apw@...onical.com>,
Ben Hutchings <ben@...adent.org.uk>
Subject: [patch] Re: Linux 3.0-rc3 (APM fix)
On Mon, 13 Jun 2011 16:01:26 -0700 Linus Torvalds wrote:
> .. and this time even with a timely tar-ball, since I'm not traveling any more.
ERROR: "pm_idle" [arch/x86/kernel/apm.ko] undefined!
ERROR: "default_idle" [arch/x86/kernel/apm.ko] undefined!
Fix was posted by Andy Whitcroft on June 8 and Ben Hutchings on June 9.
https://lkml.org/lkml/2011/6/8/170
https://lkml.org/lkml/2011/6/9/679
Below is Andy's patch since it was posted first.
Please merge some fix.
---
The commit below removed the export for pm_idle/default_idle unless the
apm module was modularised and CONFIG_APM_CPU_IDLE was set. The apm
module uses pm_idle/default_idle unconditionally, CONFIG_APM_CPU_IDLE
only affects the bios idle threshold. Adjust the export accordingly.
commit 06ae40ce073daf233607a3c54a489f2c1e44683e
Author: Len Brown <len.brown@...el.com>
Date: Fri Apr 1 15:28:09 2011 -0400
x86 idle: EXPORT_SYMBOL(default_idle, pm_idle) only when APM demands it
Signed-off-by: Andy Whitcroft <apw@...onical.com>
---
arch/x86/kernel/process.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
index 2e4928d..b8265d0 100644
--- a/arch/x86/kernel/process.c
+++ b/arch/x86/kernel/process.c
@@ -337,7 +337,7 @@ EXPORT_SYMBOL(boot_option_idle_override);
* Powermanagement idle function, if any..
*/
void (*pm_idle)(void);
-#if defined(CONFIG_APM_MODULE) && defined(CONFIG_APM_CPU_IDLE)
+#if defined(CONFIG_APM_MODULE)
EXPORT_SYMBOL(pm_idle);
#endif
@@ -399,7 +399,7 @@ void default_idle(void)
cpu_relax();
}
}
-#if defined(CONFIG_APM_MODULE) && defined(CONFIG_APM_CPU_IDLE)
+#if defined(CONFIG_APM_MODULE)
EXPORT_SYMBOL(default_idle);
#endif
--
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists