From owner-cvs-src@FreeBSD.ORG Thu Jul 27 19:47:23 2006 Return-Path: X-Original-To: cvs-src@FreeBSD.org Delivered-To: cvs-src@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 494A216A4E0; Thu, 27 Jul 2006 19:47:23 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1B29C43D46; Thu, 27 Jul 2006 19:47:23 +0000 (GMT) (envelope-from jhb@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6RJlMdT013843; Thu, 27 Jul 2006 19:47:22 GMT (envelope-from jhb@repoman.freebsd.org) Received: (from jhb@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6RJlMS6013842; Thu, 27 Jul 2006 19:47:22 GMT (envelope-from jhb) Message-Id: <200607271947.k6RJlMS6013842@repoman.freebsd.org> From: John Baldwin Date: Thu, 27 Jul 2006 19:47:22 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Cc: Subject: cvs commit: src/sys/amd64/amd64 machdep.c src/sys/i386/i386 machdep.c X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Jul 2006 19:47:23 -0000 jhb 2006-07-27 19:47:22 UTC FreeBSD src repository Modified files: sys/amd64/amd64 machdep.c sys/i386/i386 machdep.c Log: Don't allow MAXMEM or hw.physmem to extend the top of memory if our memory map was obtained from the SMAP. SMAP is trustworthy, and the memory extending feature is a band-aid for older systems where FreeBSD's methods of detecting memory were not always trustworthy. This fixes the issue where using hw.physmem could result in the ACPI tables getting trashed breaking ACPI. MFC after: 3 days Tested on: i386 Revision Changes Path 1.651 +7 -7 src/sys/amd64/amd64/machdep.c 1.631 +10 -1 src/sys/i386/i386/machdep.c