From owner-svn-src-projects@FreeBSD.ORG Thu Nov 21 22:17:56 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8CE6233C; Thu, 21 Nov 2013 22:17:56 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 7CB432B1D; Thu, 21 Nov 2013 22:17:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rALMHuh0082749; Thu, 21 Nov 2013 22:17:56 GMT (envelope-from emaste@svn.freebsd.org) Received: (from emaste@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rALMHu05082748; Thu, 21 Nov 2013 22:17:56 GMT (envelope-from emaste@svn.freebsd.org) Message-Id: <201311212217.rALMHu05082748@svn.freebsd.org> From: Ed Maste Date: Thu, 21 Nov 2013 22:17:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r258450 - projects/uefi/sys/amd64/amd64 X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Nov 2013 22:17:56 -0000 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 */