[PATCH] fix CONFIG_APM=m in 2.5.69-bk11

mikpe@csd.uu.se
Sat, 17 May 2003 15:00:14 +0200 (MEST)


Linus,

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.

/Mikael

--- linux-2.5.69-bk11/arch/i386/kernel/Makefile.~1~ 2003-05-17 13:02:25.000000000 +0200
+++ linux-2.5.69-bk11/arch/i386/kernel/Makefile 2003-05-17 13:42:21.000000000 +0200
@@ -17,7 +17,8 @@
obj-$(CONFIG_X86_MSR) += msr.o
obj-$(CONFIG_X86_CPUID) += cpuid.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_TRAMPOLINE) += trampoline.o
obj-$(CONFIG_X86_MPPARSE) += mpparse.o
--- linux-2.5.69-bk11/arch/i386/kernel/suspend.c.~1~ 2003-05-17 13:02:25.000000000 +0200
+++ linux-2.5.69-bk11/arch/i386/kernel/suspend.c 2003-05-17 13:53:29.000000000 +0200
@@ -130,3 +130,6 @@
}

}
+
+EXPORT_SYMBOL(save_processor_state);
+EXPORT_SYMBOL(restore_processor_state);
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/