Date: Fri, 14 Nov 2003 15:14:57 -0800 (PST) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 42405 for review Message-ID: <200311142314.hAENEvDS083597@repoman.freebsd.org>
index | next in thread | raw e-mail
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.hhelp
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200311142314.hAENEvDS083597>