From owner-p4-projects@FreeBSD.ORG  Fri Nov 14 15:14:59 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id F306616A4D0; Fri, 14 Nov 2003 15:14:58 -0800 (PST)
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 CD7E216A4CE
	for <perforce@freebsd.org>; Fri, 14 Nov 2003 15:14:58 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4D37743F3F
	for <perforce@freebsd.org>; Fri, 14 Nov 2003 15:14:58 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hAENEwXJ083600
	for <perforce@freebsd.org>; Fri, 14 Nov 2003 15:14:58 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hAENEvDS083597
	for perforce@freebsd.org; Fri, 14 Nov 2003 15:14:57 -0800 (PST)
	(envelope-from peter@freebsd.org)
Date: Fri, 14 Nov 2003 15:14:57 -0800 (PST)
Message-Id: <200311142314.hAENEvDS083597@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 42405 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: Fri, 14 Nov 2003 23:14:59 -0000

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

Change 42405 by peter@peter_daintree on 2003/11/14 15:14:36

	if you include 'device atpic', you get mixed mode by default too.
	Sigh.

Affected files ...

.. //depot/projects/hammer/sys/amd64/amd64/io_apic.c#18 edit
.. //depot/projects/hammer/sys/conf/options.amd64#17 edit

Differences ...

==== //depot/projects/hammer/sys/amd64/amd64/io_apic.c#18 (text+ko) ====

@@ -30,6 +30,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD: src/sys/i386/i386/io_apic.c,v 1.6 2003/11/12 18:13:57 jhb Exp $");
 
+#include "opt_atpic.h"
 #include "opt_isa.h"
 #include "opt_mixed_mode.h"
 
@@ -50,8 +51,8 @@
 #include <machine/apicvar.h>
 #include <machine/segments.h>
 
-#if defined(MIXED_MODE) && !defined(DEV_ISA)
-#error "You need the isa device for mixed mode!";
+#if defined(DEV_ISA) && defined(DEV_ATPIC) && !defined(NO_MIXED_MODE)
+#define	MIXED_MODE
 #endif
 
 #define IOAPIC_ISA_INTS		16

==== //depot/projects/hammer/sys/conf/options.amd64#17 (text+ko) ====

@@ -31,5 +31,5 @@
 PSM_RESETAFTERSUSPEND	opt_psm.h
 PSM_DEBUG		opt_psm.h
 IA32
-MIXED_MODE
+NO_MIXED_MODE
 DEV_ATPIC		opt_atpic.h