From owner-p4-projects@FreeBSD.ORG  Tue Apr  8 23:50:48 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A400B37B404; Tue,  8 Apr 2003 23:50:47 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 4E66A37B401
	for <perforce@freebsd.org>; Tue,  8 Apr 2003 23:50:47 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id E095743F85
	for <perforce@freebsd.org>; Tue,  8 Apr 2003 23:50:46 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h396ok0U051255
	for <perforce@freebsd.org>; Tue, 8 Apr 2003 23:50:46 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h396okRT051250
	for perforce@freebsd.org; Tue, 8 Apr 2003 23:50:46 -0700 (PDT)
Date: Tue, 8 Apr 2003 23:50:46 -0700 (PDT)
Message-Id: <200304090650.h396okRT051250@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 28621 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 09 Apr 2003 06:50:48 -0000

http://perforce.freebsd.org/chv.cgi?CH=28621

Change 28621 by peter@peter_daintree on 2003/04/08 23:49:57

	Do not auto-load acpi for the hammer kernels.  It is(will be) mandatory
	that it is compiled into the kernel.

Affected files ...

.. //depot/projects/hammer/sys/boot/i386/libi386/i386_module.c#3 edit

Differences ...

==== //depot/projects/hammer/sys/boot/i386/libi386/i386_module.c#3 (text+ko) ====

@@ -50,6 +50,9 @@
     /* XXX use PnP to locate stuff here */
 
     /* autoload ACPI support */
+    if (file_findfile(NULL, "elf64 kernel") != NULL)
+	return (0);	/* ACPI is mandatory on hammer */
+
     /* XXX should be in 4th keyed off acpi_load */
     disabled = 0;
     rv = getenv("hint.acpi.0.disabled");