From owner-svn-src-head@freebsd.org Sun Apr 3 23:03:56 2016 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 44B4DB024B0; Sun, 3 Apr 2016 23:03:56 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1AC171E06; Sun, 3 Apr 2016 23:03:56 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u33N3tkL010949; Sun, 3 Apr 2016 23:03:55 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u33N3shh010945; Sun, 3 Apr 2016 23:03:54 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <201604032303.u33N3shh010945@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Sun, 3 Apr 2016 23:03:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r297530 - in head/sys: amd64/amd64 conf i386/i386 x86/x86 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Apr 2016 23:03:56 -0000 Author: jhb Date: Sun Apr 3 23:03:54 2016 New Revision: 297530 URL: https://svnweb.freebsd.org/changeset/base/297530 Log: Move i386/i386/autoconf.c to sys/x86/x86 and use it on both amd64 and i386. Added: head/sys/x86/x86/autoconf.c - copied, changed from r297529, head/sys/i386/i386/autoconf.c Deleted: head/sys/amd64/amd64/autoconf.c head/sys/i386/i386/autoconf.c Modified: head/sys/conf/files.amd64 head/sys/conf/files.i386 head/sys/conf/files.pc98 Modified: head/sys/conf/files.amd64 ============================================================================== --- head/sys/conf/files.amd64 Sun Apr 3 20:29:21 2016 (r297529) +++ head/sys/conf/files.amd64 Sun Apr 3 23:03:54 2016 (r297530) @@ -104,7 +104,6 @@ acpi_wakedata.h optional acpi \ amd64/amd64/amd64_mem.c optional mem #amd64/amd64/apic_vector.S standard amd64/amd64/atomic.c standard -amd64/amd64/autoconf.c standard amd64/amd64/bios.c standard amd64/amd64/bpf_jit_machdep.c optional bpf_jitter amd64/amd64/cpu_switch.S standard @@ -596,6 +595,7 @@ x86/isa/nmi.c standard x86/isa/orm.c optional isa x86/pci/pci_bus.c optional pci x86/pci/qpi.c optional pci +x86/x86/autoconf.c standard x86/x86/bus_machdep.c standard x86/x86/busdma_bounce.c standard x86/x86/busdma_machdep.c standard Modified: head/sys/conf/files.i386 ============================================================================== --- head/sys/conf/files.i386 Sun Apr 3 20:29:21 2016 (r297529) +++ head/sys/conf/files.i386 Sun Apr 3 23:03:54 2016 (r297530) @@ -452,7 +452,6 @@ i386/bios/smapi_bios.S optional smapi #i386/i386/apic_vector.s optional apic i386/i386/atomic.c standard \ compile-with "${CC} -c ${CFLAGS} ${DEFINED_PROF:S/^$/-fomit-frame-pointer/} ${.IMPSRC}" -i386/i386/autoconf.c standard i386/i386/bios.c standard i386/i386/bioscall.s standard i386/i386/bpf_jit_machdep.c optional bpf_jitter @@ -591,6 +590,7 @@ x86/isa/nmi.c standard x86/isa/orm.c optional isa x86/pci/pci_bus.c optional pci x86/pci/qpi.c optional pci +x86/x86/autoconf.c standard x86/x86/bus_machdep.c standard x86/x86/busdma_bounce.c standard x86/x86/busdma_machdep.c standard Modified: head/sys/conf/files.pc98 ============================================================================== --- head/sys/conf/files.pc98 Sun Apr 3 20:29:21 2016 (r297529) +++ head/sys/conf/files.pc98 Sun Apr 3 23:03:54 2016 (r297530) @@ -147,7 +147,6 @@ i386/bios/apm.c optional apm #i386/i386/apic_vector.s optional apic i386/i386/atomic.c standard \ compile-with "${CC} -c ${CFLAGS} ${DEFINED_PROF:S/^$/-fomit-frame-pointer/} ${.IMPSRC}" -i386/i386/autoconf.c standard i386/i386/bios.c standard i386/i386/bioscall.s standard i386/i386/bpf_jit_machdep.c optional bpf_jitter @@ -258,6 +257,7 @@ x86/isa/atpic.c optional atpic x86/isa/clock.c standard x86/isa/isa.c optional isa x86/pci/pci_bus.c optional pci +x86/x86/autoconf.c standard x86/x86/busdma_bounce.c standard x86/x86/busdma_machdep.c standard x86/x86/cpu_machdep.c standard Copied and modified: head/sys/x86/x86/autoconf.c (from r297529, head/sys/i386/i386/autoconf.c) ============================================================================== --- head/sys/i386/i386/autoconf.c Sun Apr 3 20:29:21 2016 (r297529, copy source) +++ head/sys/x86/x86/autoconf.c Sun Apr 3 23:03:54 2016 (r297530) @@ -65,7 +65,9 @@ __FBSDID("$FreeBSD$"); #include #include +#ifdef PC98 #include +#endif #include #ifdef DEV_ISA @@ -92,7 +94,7 @@ configure_first(dummy) void *dummy; { - /* nexus0 is the top of the i386 device tree */ + /* nexus0 is the top of the x86 device tree */ device_add_child(root_bus, "nexus", 0); }