Commit e432a562 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] fix CONFIG_APM=m

From: mikpe@csd.uu.se

Here is a patch to fix CONFIG_APM=m in 2.5.69-bk11.  My patch to have APM
restore the systenter MSRs failed to handle the modular case, which fails
with unresolved symbols.

Since suspend.o is used from both APM (module or built-in) and ACPI sleep
(built-in), I made suspend.o built-in and dependent on CONFIG_PM.
parent afd64673
...@@ -17,7 +17,8 @@ obj-$(CONFIG_MCA) += mca.o ...@@ -17,7 +17,8 @@ obj-$(CONFIG_MCA) += mca.o
obj-$(CONFIG_X86_MSR) += msr.o obj-$(CONFIG_X86_MSR) += msr.o
obj-$(CONFIG_X86_CPUID) += cpuid.o obj-$(CONFIG_X86_CPUID) += cpuid.o
obj-$(CONFIG_MICROCODE) += microcode.o obj-$(CONFIG_MICROCODE) += microcode.o
obj-$(CONFIG_APM) += apm.o suspend.o obj-$(CONFIG_PM) += suspend.o
obj-$(CONFIG_APM) += apm.o
obj-$(CONFIG_X86_SMP) += smp.o smpboot.o obj-$(CONFIG_X86_SMP) += smp.o smpboot.o
obj-$(CONFIG_X86_TRAMPOLINE) += trampoline.o obj-$(CONFIG_X86_TRAMPOLINE) += trampoline.o
obj-$(CONFIG_X86_MPPARSE) += mpparse.o obj-$(CONFIG_X86_MPPARSE) += mpparse.o
......
...@@ -130,3 +130,6 @@ static void fix_processor_context(void) ...@@ -130,3 +130,6 @@ static void fix_processor_context(void)
} }
} }
EXPORT_SYMBOL(save_processor_state);
EXPORT_SYMBOL(restore_processor_state);
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