svn commit: r215903 - in stable/8/sys/amd64: acpica amd64

[Jung-uk Kim]

Author: jkim
Date: Fri Nov 26 21:36:38 2010
New Revision: 215903
URL: http://svn.freebsd.org/changeset/base/215903

Log:
  MFC:	r211202, r211292
  
  Reset switchtime and switchticks after resynchronizing the system clock.

Modified:
  stable/8/sys/amd64/acpica/acpi_wakeup.c
  stable/8/sys/amd64/amd64/mp_machdep.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/amd64/acpica/acpi_wakeup.c
==============================================================================
--- stable/8/sys/amd64/acpica/acpi_wakeup.c	Fri Nov 26 21:33:26 2010	(r215902)
+++ stable/8/sys/amd64/acpica/acpi_wakeup.c	Fri Nov 26 21:36:38 2010	(r215903)
@@ -278,6 +278,8 @@ acpi_sleep_machdep(struct acpi_softc *sc
 		for (;;)
 			ia32_pause();
 	} else {
+		PCPU_SET(switchtime, 0);
+		PCPU_SET(switchticks, ticks);
 #ifdef SMP
 		if (wakeup_cpus != 0)
 			acpi_wakeup_cpus(sc, wakeup_cpus);

Modified: stable/8/sys/amd64/amd64/mp_machdep.c
==============================================================================
--- stable/8/sys/amd64/amd64/mp_machdep.c	Fri Nov 26 21:33:26 2010	(r215902)
+++ stable/8/sys/amd64/amd64/mp_machdep.c	Fri Nov 26 21:36:38 2010	(r215903)
@@ -1327,6 +1327,9 @@ cpususpend_handler(void)
 	if (savectx(susppcbs[cpu])) {
 		wbinvd();
 		atomic_set_int(&stopped_cpus, cpumask);
+	} else {
+		PCPU_SET(switchtime, 0);
+		PCPU_SET(switchticks, ticks);
 	}
 
 	/* Wait for resume */