PERFORCE change 132024 for review

[Kip Macy]

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

Change 132024 by kmacy at pandemonium:kmacy:xen31 on 2007/12/30 05:10:32

	disable atpic on default XEN config

Affected files ...

.. //depot/projects/xen31/sys/conf/files.i386#11 edit
.. //depot/projects/xen31/sys/i386/conf/DEFAULTS#4 edit
.. //depot/projects/xen31/sys/i386/conf/XEN#2 edit
.. //depot/projects/xen31/sys/i386/i386/machdep.c#9 edit
.. //depot/projects/xen31/sys/i386/xen/exception.s#2 edit

Differences ...

==== //depot/projects/xen31/sys/conf/files.i386#11 (text+ko) ====

@@ -328,6 +328,7 @@
 i386/i386/uio_machdep.c		standard
 i386/i386/vm86.c		standard
 i386/i386/vm_machdep.c		standard
+i386/xen/xen_bus.c		optional xen 
 i386/ibcs2/ibcs2_errno.c	optional ibcs2
 i386/ibcs2/ibcs2_fcntl.c	optional ibcs2
 i386/ibcs2/ibcs2_ioctl.c	optional ibcs2
@@ -347,7 +348,7 @@
 i386/ibcs2/ibcs2_xenix.c	optional ibcs2
 i386/ibcs2/ibcs2_xenix_sysent.c	optional ibcs2
 i386/ibcs2/imgact_coff.c	optional ibcs2
-i386/isa/atpic.c		standard
+i386/isa/atpic.c		optional atpic
 #i386/isa/atpic_vector.s		standard
 i386/isa/clock.c		optional native
 i386/xen/clock.c		optional xen

==== //depot/projects/xen31/sys/i386/conf/DEFAULTS#4 (text+ko) ====

@@ -15,6 +15,7 @@
 # Pseudo devices.
 device		mem		# Memory and kernel memory devices
 device		io		# I/O device
+device		atpic
 
 # UART chips on this platform
 device		uart_ns8250

==== //depot/projects/xen31/sys/i386/conf/XEN#2 (text+ko) ====

@@ -145,7 +145,6 @@
 device		cardbus		# CardBus (32-bit) bus
 
 # Serial (COM) ports
-device		sio		# 8250, 16[45]50 based serial ports
 device		uart		# Generic UART driver
 
 # Parallel port
@@ -192,3 +191,4 @@
 
 options		XEN
 nooption	NATIVE
+nodevice	atpic

==== //depot/projects/xen31/sys/i386/i386/machdep.c#9 (text+ko) ====

@@ -2307,7 +2307,9 @@
 #ifdef DEV_ISA
 	if (xen_start_info->flags & SIF_PRIVILEGED) {
 		elcr_probe();
+#ifdef DEV_ATPIC		
 		atpic_startup();
+#endif		
 	}
 #endif
 

==== //depot/projects/xen31/sys/i386/xen/exception.s#2 (text+ko) ====

@@ -260,8 +260,10 @@
 	SUPERALIGN_TEXT
 MCOUNT_LABEL(bintr)
 
+#ifdef DEV_ATPIC	
 #include <i386/isa/atpic_vector.s>
-
+#endif
+	
 #ifdef DEV_APIC
 	.data
 	.p2align 4