Merge

arch/i386/kernel/acpi/boot.c

@@ -26,9 +26,13 @@
 #include <linux/init.h>
 #include <linux/acpi.h>
 #include <asm/pgalloc.h>
+#include <asm/apic.h>
+#include <asm/mpspec.h>
 
+#if defined (CONFIG_X86_LOCAL_APIC)
 #include <mach_apic.h>
 #include <mach_mpparse.h>
+#endif
 
 #define PREFIX			"ACPI: "
 

arch/i386/kernel/suspend.c

@@ -32,6 +32,8 @@ unsigned long saved_context_eax, saved_context_ebx, saved_context_ecx, saved_con
 unsigned long saved_context_esp, saved_context_ebp, saved_context_esi, saved_context_edi;
 unsigned long saved_context_eflags;
 
+extern void enable_sep_cpu(void *);
+
 void save_processor_state(void)
 {
 	kernel_fpu_begin();
@@ -96,6 +98,12 @@ void restore_processor_state(void)
 	asm volatile ("lidt %0" :: "m" (saved_context.idt_limit));
 	asm volatile ("lldt %0" :: "m" (saved_context.ldt));
 
+	/*
+	 * sysenter MSRs
+	 */
+	if (boot_cpu_has(X86_FEATURE_SEP))
+		enable_sep_cpu(NULL);
+
 	fix_processor_context();
 	do_fpu_end();
 }

arch/i386/kernel/sysenter.c

@@ -35,7 +35,7 @@ struct fake_sep_struct {
 	unsigned char stack[0];
 } __attribute__((aligned(8192)));
 	
-static void __init enable_sep_cpu(void *info)
+void enable_sep_cpu(void *info)
 {
 	int cpu = get_cpu();
 	struct tss_struct *tss = init_tss + cpu;

drivers/acpi/Kconfig

@@ -76,7 +76,9 @@ config ACPI_SLEEP
 	  power management development.
 
 config ACPI_SLEEP_PROC_FS
+	bool
 	depends on ACPI_SLEEP && PROC_FS
+	default y
 
 config ACPI_AC
 	tristate "AC Adapter"