Date: Sun, 17 Jan 2010 23:23:35 +0000 (UTC) From: Attilio Rao <attilio@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r202534 - in head/sys: conf i386/isa pc98/cbus pc98/conf Message-ID: <201001172323.o0HNNZkd076868@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: attilio Date: Sun Jan 17 23:23:35 2010 New Revision: 202534 URL: http://svn.freebsd.org/changeset/base/202534 Log: - Allow clock subsystem to be compiled without the apic support [0] - ATPIC, on pc98 is never defined somewhere, differently from i386. Turn its compilation to be conditional as i386 does. [1] [0] Reported by: nyan [1] Submitted by: nyan Modified: head/sys/conf/files.pc98 head/sys/i386/isa/clock.c head/sys/pc98/cbus/clock.c head/sys/pc98/conf/DEFAULTS Modified: head/sys/conf/files.pc98 ============================================================================== --- head/sys/conf/files.pc98 Sun Jan 17 22:40:47 2010 (r202533) +++ head/sys/conf/files.pc98 Sun Jan 17 23:23:35 2010 (r202534) @@ -194,7 +194,7 @@ i386/ibcs2/ibcs2_util.c optional ibcs2 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/elink.c optional ep | ie i386/isa/isa.c optional isa @@ -240,7 +240,7 @@ pc98/cbus/gdc.c optional gdc pc98/cbus/nmi.c standard pc98/cbus/olpt.c optional olpt pc98/cbus/pckbd.c optional pckbd -pc98/cbus/pcrtc.c standard +pc98/cbus/pcrtc.c optional atpic pc98/cbus/pmc.c optional pmc pc98/cbus/scgdcrndr.c optional sc gdc pc98/cbus/scterm-sck.c optional sc Modified: head/sys/i386/isa/clock.c ============================================================================== --- head/sys/i386/isa/clock.c Sun Jan 17 22:40:47 2010 (r202533) +++ head/sys/i386/isa/clock.c Sun Jan 17 23:23:35 2010 (r202534) @@ -65,9 +65,7 @@ __FBSDID("$FreeBSD$"); #include <machine/frame.h> #include <machine/intr_machdep.h> #include <machine/md_var.h> -#ifdef DEV_APIC #include <machine/apicvar.h> -#endif #include <machine/ppireg.h> #include <machine/timerreg.h> #include <machine/smp.h> Modified: head/sys/pc98/cbus/clock.c ============================================================================== --- head/sys/pc98/cbus/clock.c Sun Jan 17 22:40:47 2010 (r202533) +++ head/sys/pc98/cbus/clock.c Sun Jan 17 23:23:35 2010 (r202534) @@ -67,9 +67,7 @@ __FBSDID("$FreeBSD$"); #include <machine/frame.h> #include <machine/intr_machdep.h> #include <machine/md_var.h> -#ifdef DEV_APIC #include <machine/apicvar.h> -#endif #include <machine/ppireg.h> #include <machine/timerreg.h> #include <machine/smp.h> Modified: head/sys/pc98/conf/DEFAULTS ============================================================================== --- head/sys/pc98/conf/DEFAULTS Sun Jan 17 22:40:47 2010 (r202533) +++ head/sys/pc98/conf/DEFAULTS Sun Jan 17 23:23:35 2010 (r202534) @@ -24,3 +24,6 @@ device uart_ns8250 # Default partitioning schemes options GEOM_PART_BSD options GEOM_PART_PC98 + +# enable support for native hardware +device atpic
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201001172323.o0HNNZkd076868>