svn commit: r234197 - in stable/9/sys/amd64: acpica amd64

[Jung-uk Kim]

Author: jkim
Date: Thu Apr 12 23:06:07 2012
New Revision: 234197
URL: http://svn.freebsd.org/changeset/base/234197

Log:
  MFC:	r233704
  
  Re-initialize more model-specific registers when we resume CPUs.

Modified:
  stable/9/sys/amd64/acpica/acpi_wakeup.c
  stable/9/sys/amd64/amd64/mp_machdep.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/amd64/acpica/acpi_wakeup.c
==============================================================================
--- stable/9/sys/amd64/acpica/acpi_wakeup.c	Thu Apr 12 21:34:58 2012	(r234196)
+++ stable/9/sys/amd64/acpica/acpi_wakeup.c	Thu Apr 12 23:06:07 2012	(r234197)
@@ -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: stable/9/sys/amd64/amd64/mp_machdep.c
==============================================================================
--- stable/9/sys/amd64/amd64/mp_machdep.c	Thu Apr 12 21:34:58 2012	(r234196)
+++ stable/9/sys/amd64/amd64/mp_machdep.c	Thu Apr 12 23:06:07 2012	(r234197)
@@ -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);
 	}