PERFORCE change 42088 for review

[Peter Wemm]

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

Change 42088 by peter at peter_daintree on 2003/11/11 19:36:56

	invert NO_MIXED_MODE for amd64.

Affected files ...

.. //depot/projects/hammer/sys/amd64/amd64/io_apic.c#16 edit
.. //depot/projects/hammer/sys/conf/options.amd64#15 edit

Differences ...

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

@@ -31,7 +31,7 @@
 __FBSDID("$FreeBSD: src/sys/i386/i386/io_apic.c,v 1.5 2003/11/07 23:44:35 jhb Exp $");
 
 #include "opt_isa.h"
-#include "opt_no_mixed_mode.h"
+#include "opt_mixed_mode.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -50,8 +50,8 @@
 #include <machine/apicvar.h>
 #include <machine/segments.h>
 
-#if defined(DEV_ISA) && !defined(NO_MIXED_MODE)
-#define MIXED_MODE
+#if defined(MIXED_MODE) && !defined(DEV_ISA)
+#error "You need the isa device for mixed mode!";
 #endif
 
 #define IOAPIC_ISA_INTS		16

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

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