svn commit: r233704 - in head/sys/amd64: acpica amd64

[Jung-uk Kim]

Author: jkim
Date: Fri Mar 30 17:03:06 2012
New Revision: 233704
URL: http://svn.freebsd.org/changeset/base/233704

Log:
  Re-initialize model-specific MSRs when we resume CPUs.
  
  MFC after:	1 week

Modified:
  head/sys/amd64/acpica/acpi_wakeup.c
  head/sys/amd64/amd64/mp_machdep.c

Modified: head/sys/amd64/acpica/acpi_wakeup.c
==============================================================================
--- head/sys/amd64/acpica/acpi_wakeup.c	Fri Mar 30 16:54:21 2012	(r233703)
+++ head/sys/amd64/acpica/acpi_wakeup.c	Fri Mar 30 17:03:06 2012	(r233704)
@@ -284,6 +284,7 @@ acpi_sleep_machdep(struct acpi_softc *sc
 	} else {
 		pmap_init_pat();
 		load_cr3(susppcbs[0]->pcb_cr3);
+		initializecpu();
 		PCPU_SET(switchtime, 0);
 		PCPU_SET(switchticks, ticks);
 #ifdef SMP

Modified: head/sys/amd64/amd64/mp_machdep.c
==============================================================================
--- head/sys/amd64/amd64/mp_machdep.c	Fri Mar 30 16:54:21 2012	(r233703)
+++ head/sys/amd64/amd64/mp_machdep.c	Fri Mar 30 17:03:06 2012	(r233704)
@@ -1425,6 +1425,7 @@ cpususpend_handler(void)
 	} else {
 		pmap_init_pat();
 		load_cr3(susppcbs[cpu]->pcb_cr3);
+		initializecpu();
 		PCPU_SET(switchtime, 0);
 		PCPU_SET(switchticks, ticks);
 	}