Index: head/sys/conf/files.amd64
===================================================================
--- head/sys/conf/files.amd64	(revision 109989)
+++ head/sys/conf/files.amd64	(revision 109990)
@@ -1,68 +1,67 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
 # $FreeBSD$
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
 # dependency lines other than the first are silently ignored.
 #
 
 dev/kbd/atkbd.c			optional	atkbd
 dev/kbd/atkbdc.c		optional	atkbdc
 dev/kbd/kbd.c			optional	atkbd
 dev/kbd/kbd.c			optional	kbd
 dev/kbd/kbd.c			optional	sc
 dev/kbd/kbd.c			optional	ukbd
 dev/kbd/kbd.c			optional	vt
 dev/sio/sio.c			optional	sio
 dev/sio/sio_isa.c		optional	sio isa
 dev/syscons/apm/apm_saver.c	optional	apm_saver apm
 dev/syscons/schistory.c		optional	sc
 dev/syscons/scmouse.c		optional	sc
 dev/syscons/scterm.c		optional	sc
 dev/syscons/scterm-dumb.c	optional	sc
 dev/syscons/scterm-sc.c		optional	sc
 dev/syscons/scvesactl.c		optional	sc vga vesa
 dev/syscons/scvgarndr.c		optional	sc vga
 dev/syscons/scvidctl.c		optional	sc
 dev/syscons/scvtb.c		optional	sc
 dev/syscons/syscons.c		optional	sc
 dev/syscons/sysmouse.c		optional	sc
 isa/atkbd_isa.c			optional	atkbd
 
 libkern/ffs.c			standard
-kern/subr_disklabel.c		standard
 
 x86_64/x86_64/autoconf.c	standard
 x86_64/x86_64/bios.c		standard
 x86_64/x86_64/bioscall.s	standard
 x86_64/x86_64/busdma_machdep.c	standard
 x86_64/x86_64/critical.c	standard
 x86_64/x86_64/db_disasm.c	optional	ddb
 x86_64/x86_64/db_interface.c	optional	ddb
 x86_64/x86_64/db_trace.c	optional	ddb
 x86_64/x86_64/dump_machdep.c	standard
 x86_64/x86_64/elf_machdep.c	standard
 x86_64/x86_64/exception.s	standard
 x86_64/x86_64/i686_mem.c	standard
 x86_64/x86_64/identcpu.c	standard
 x86_64/x86_64/initcpu.c		standard
 x86_64/x86_64/k6_mem.c		standard
 # locore.s needs to be handled in Makefile to put it first.  Otherwise it's
 # now normal.
 # x86_64/x86_64/locore.s	standard
 x86_64/x86_64/machdep.c		standard
 x86_64/x86_64/mem.c		standard
 x86_64/x86_64/nexus.c		standard
 x86_64/x86_64/pmap.c		standard
 x86_64/x86_64/support.s		standard
 x86_64/x86_64/swtch.s		standard
 x86_64/x86_64/sys_machdep.c	standard
 x86_64/x86_64/trap.c		standard
 x86_64/x86_64/vm86.c		standard
 x86_64/x86_64/vm_machdep.c	standard
 
 x86_64/isa/clock.c		standard
 x86_64/isa/intr_machdep.c	standard
 x86_64/isa/ithread.c		standard
Index: head/sys/conf/files.powerpc
===================================================================
--- head/sys/conf/files.powerpc	(revision 109989)
+++ head/sys/conf/files.powerpc	(revision 109990)
@@ -1,81 +1,80 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
 # $FreeBSD$
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
 # dependency lines other than the first are silently ignored.
 #
 #
-kern/subr_disklabel.c		standard
 
 powerpc/powerpc/atomic.S	standard
 powerpc/powerpc/autoconf.c	standard
 powerpc/powerpc/bcopy.c		standard
 powerpc/powerpc/busdma_machdep.c standard
 powerpc/powerpc/clock.c		standard
 powerpc/powerpc/copyinout.c	standard
 powerpc/powerpc/copystr.c	standard
 powerpc/powerpc/critical.c	standard
 powerpc/powerpc/elf_machdep.c	standard
 powerpc/powerpc/fpu.c		standard
 powerpc/powerpc/fuswintr.c	standard
 powerpc/powerpc/in_cksum.c	optional	inet
 powerpc/powerpc/interrupt.c	standard
 powerpc/powerpc/intr_machdep.c	standard
 powerpc/powerpc/machdep.c	standard
 powerpc/powerpc/nexus.c		standard
 powerpc/powerpc/ofwmagic.S	standard
 powerpc/powerpc/ofw_machdep.c	standard
 powerpc/powerpc/openpic.c	standard
 powerpc/powerpc/pic_if.m	standard
 powerpc/powerpc/pmap.c		standard
 powerpc/powerpc/setjmp.S	standard
 powerpc/powerpc/sigcode.S	standard
 powerpc/powerpc/suswintr.c	standard
 powerpc/powerpc/syncicache.c	standard
 powerpc/powerpc/sys_machdep.c	standard
 powerpc/powerpc/swtch.S		standard
 powerpc/powerpc/trap.c		standard
 powerpc/powerpc/vm_machdep.c	standard
 
 powerpc/powerpc/db_disasm.c	optional	ddb
 powerpc/powerpc/db_interface.c	optional	ddb
 powerpc/powerpc/db_hwwatch.c	optional	ddb
 powerpc/powerpc/db_memrw.c	optional	ddb
 powerpc/powerpc/db_trace.c	optional	ddb
 
 crypto/blowfish/bf_enc.c	optional	ipsec ipsec_esp
 crypto/des/des_enc.c		optional	ipsec ipsec_esp
 
 dev/ofw/openfirm.c		standard
 dev/ofw/ofw_console.c		standard
 dev/ofw/ofw_disk.c		optional	ofwd
 
 libkern/ashldi3.c		standard
 libkern/ashrdi3.c		standard
 libkern/bcmp.c			standard
 libkern/divdi3.c		standard
 libkern/ffs.c			standard
 libkern/lshrdi3.c		standard
 libkern/moddi3.c		standard
 libkern/qdivrem.c		standard
 libkern/ucmpdi2.c		standard
 libkern/udivdi3.c		standard
 libkern/umoddi3.c		standard
 
 powerpc/powerpc/mp_machdep.c	optional smp
 
 powerpc/ofw/ofw_pci.c		optional	pci
 powerpc/ofw/ofw_pcib_pci.c	optional	pci
 
 powerpc/powermac/uninorth.c	optional	powermac pci
 powerpc/powermac/macio.c	optional	powermac pci
 powerpc/powermac/ata_macio.c	optional	powermac ata
 
 powerpc/psim/iobus.c 		optional psim
 powerpc/psim/ata_iobus.c	optional ata psim
 powerpc/psim/sio_iobus.c	optional sio psim