svn commit: r258450 - projects/uefi/sys/amd64/amd64

[Ed Maste]

Author: emaste
Date: Thu Nov 21 22:17:55 2013
New Revision: 258450
URL: http://svnweb.freebsd.org/changeset/base/258450

Log:
  Merge r258431 from HEAD
  
  (Merged individually due to conflict)
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  projects/uefi/sys/amd64/amd64/machdep.c
Directory Properties:
  projects/uefi/   (props changed)
  projects/uefi/gnu/lib/   (props changed)
  projects/uefi/sys/   (props changed)

Modified: projects/uefi/sys/amd64/amd64/machdep.c
==============================================================================
--- projects/uefi/sys/amd64/amd64/machdep.c	Thu Nov 21 22:07:50 2013	(r258449)
+++ projects/uefi/sys/amd64/amd64/machdep.c	Thu Nov 21 22:17:55 2013	(r258450)
@@ -1636,13 +1636,15 @@ getmemsize(vm_paddr_t first, vm_paddr_t 
 		printf("Physical memory use set to %ldK\n", Maxmem * 4);
 
 	/*
-	 * By default enable the memory test on real hardware, and disable
-	 * it if we appear to be running in a VM.  This avoids touching all
-	 * pages unnecessarily, which doesn't matter on real hardware but is
-	 * bad for shared VM hosts.  Use a general name so that
-	 * one could eventually do more with the code than just disable it.
+	 * The boot memory test is disabled by default, as it takes a
+	 * significant amount of time on large-memory systems, and is
+	 * unfriendly to virtual machines as it unnecessarily touches all
+	 * pages.
+	 *
+	 * A general name is used as the code may be extended to support
+	 * additional tests beyond the current "page present" test.
 	 */
-	memtest = (vm_guest > VM_GUEST_NO) ? 0 : 1;
+	memtest = 0;
 	TUNABLE_ULONG_FETCH("hw.memtest.tests", &memtest);
 
 	/* call pmap initialization to make new kernel address space */