Commit 60e49ba3 authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Linus Torvalds

[PATCH] 2.5.4-pre6 apm compile fix

Here is the patch against 2.5.4.  I have compiled this patch under
2.5.3, so it should still be OK.

This patch just resyncs the driver with 2.4.18-pre (which is what is
being testd by others).  The only outstanding known problem is some
very strange interaction with VMWARE.  But otherwise people seem
happy with the changes.

Original announcement to Dave Jones and Marcelo:

	Update a couple of email addresses
	Fix the idle handling (this is an improved version of the fix
		that Alan Cox has in his -ac tree)
	Notify user mode of suspend events before drivers (fix)
	Make the idling percentage boot time configurable
	Rename kapm-idled to kapmd

Credit to Andreas Steinmetz, Russell King, Thomas Hood and me.

More small updates to come.
--
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
parent 74c01024
This diff is collapsed.
...@@ -32,9 +32,11 @@ ...@@ -32,9 +32,11 @@
extern void dump_thread(struct pt_regs *, struct user *); extern void dump_thread(struct pt_regs *, struct user *);
extern spinlock_t rtc_lock; extern spinlock_t rtc_lock;
#if defined(CONFIG_APM) || defined(CONFIG_APM_MODULE) #if defined(CONFIG_APM_MODULE)
extern void machine_real_restart(unsigned char *, int); extern void machine_real_restart(unsigned char *, int);
EXPORT_SYMBOL(machine_real_restart); EXPORT_SYMBOL(machine_real_restart);
extern void default_idle(void);
EXPORT_SYMBOL(default_idle);
#endif #endif
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
...@@ -93,7 +95,6 @@ EXPORT_SYMBOL_NOVERS(__get_user_4); ...@@ -93,7 +95,6 @@ EXPORT_SYMBOL_NOVERS(__get_user_4);
EXPORT_SYMBOL(strtok); EXPORT_SYMBOL(strtok);
EXPORT_SYMBOL(strpbrk); EXPORT_SYMBOL(strpbrk);
EXPORT_SYMBOL(simple_strtol);
EXPORT_SYMBOL(strstr); EXPORT_SYMBOL(strstr);
EXPORT_SYMBOL(strncpy_from_user); EXPORT_SYMBOL(strncpy_from_user);
......
...@@ -78,7 +78,7 @@ void enable_hlt(void) ...@@ -78,7 +78,7 @@ void enable_hlt(void)
* We use this if we don't have any better * We use this if we don't have any better
* idle routine.. * idle routine..
*/ */
static void default_idle(void) void default_idle(void)
{ {
if (current_cpu_data.hlt_works_ok && !hlt_counter) { if (current_cpu_data.hlt_works_ok && !hlt_counter) {
__cli(); __cli();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment