Move subr_disklabel.c and subr_diskslice.c from being MI to MD files,

so that they can be left out where they are unneeded.

8 files changed, 14 insertions, 2 deletions

diff --git a/sys/conf/files b/sys/conf/files
index b685a5b..8339a71 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1031,8 +1031,6 @@ kern/subr_bus.c		standard
 kern/subr_clock.c	optional genclock
 kern/subr_devstat.c	standard
 kern/subr_disk.c	standard
-kern/subr_disklabel.c	standard
-kern/subr_diskslice.c	standard
 kern/subr_eventhandler.c	standard
 kern/subr_hints.c	standard
 kern/subr_kobj.c	standard
diff --git a/sys/conf/files.alpha b/sys/conf/files.alpha
index 5849c26..d94d3cb 100644
--- a/sys/conf/files.alpha
+++ b/sys/conf/files.alpha
@@ -201,7 +201,9 @@ isa/ppc.c                       optional        ppc
 isa/psm.c			optional	psm
 isa/syscons_isa.c		optional	sc
 isa/vga_isa.c			optional	vga
+kern/subr_disklabel.c		standard
 kern/subr_diskmbr.c		standard
+kern/subr_diskslice.c		standard
 libkern/alpha/bswap16.S		standard
 libkern/alpha/bswap32.S		standard
 libkern/bcmp.c			standard
diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64
index 716ebda..27060d5 100644
--- a/sys/conf/files.amd64
+++ b/sys/conf/files.amd64
@@ -32,7 +32,9 @@ dev/syscons/sysmouse.c		optional	sc
 isa/atkbd_isa.c			optional	atkbd
 
 libkern/ffs.c			standard
+kern/subr_disklabel.c		standard
 kern/subr_diskmbr.c		standard
+kern/subr_diskslice.c		standard
 
 x86_64/x86_64/autoconf.c	standard
 x86_64/x86_64/bios.c		standard
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index 7a09f99..fb2b905 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -411,7 +411,9 @@ isa/syscons_isa.c		optional	sc
 isa/vga_isa.c			optional	vga
 kern/imgact_aout.c		optional	compat_aout
 kern/imgact_gzip.c		optional	gzip
+kern/subr_disklabel.c		standard
 kern/subr_diskmbr.c		standard
+kern/subr_diskslice.c		standard
 libkern/divdi3.c		standard
 libkern/moddi3.c		standard
 libkern/qdivrem.c		standard
diff --git a/sys/conf/files.ia64 b/sys/conf/files.ia64
index e3417eb..b747f0a 100644
--- a/sys/conf/files.ia64
+++ b/sys/conf/files.ia64
@@ -110,7 +110,9 @@ isa/psm.c			optional	psm
 isa/syscons_isa.c		optional	sc
 isa/vga_isa.c			optional	vga
 kern/imgact_elf32.c		optional	ia32
+kern/subr_disklabel.c		standard
 kern/subr_diskmbr.c		standard
+kern/subr_diskslice.c		standard
 libkern/ia64/bswap16.S		standard
 libkern/ia64/bswap32.S		standard
 libkern/ia64/__divsi3.S		standard
diff --git a/sys/conf/files.pc98 b/sys/conf/files.pc98
index 29ae616..1baad05 100644
--- a/sys/conf/files.pc98
+++ b/sys/conf/files.pc98
@@ -367,7 +367,9 @@ i4b/layer1/itjc/i4b_itjc_l1fsm.c	optional	itjc
 #
 kern/imgact_aout.c		optional	compat_aout
 kern/imgact_gzip.c		optional	gzip
+kern/subr_disklabel.c		standard
 kern/subr_diskmbr.c		count		compat_atdisk
+kern/subr_diskslice.c		standard
 libkern/divdi3.c		standard
 libkern/moddi3.c		standard
 libkern/qdivrem.c		standard
diff --git a/sys/conf/files.powerpc b/sys/conf/files.powerpc
index d89af5d..8629646 100644
--- a/sys/conf/files.powerpc
+++ b/sys/conf/files.powerpc
@@ -8,7 +8,9 @@
 # dependency lines other than the first are silently ignored.
 #
 #
+kern/subr_disklabel.c		standard
 kern/subr_diskmbr.c		standard
+kern/subr_diskslice.c		standard
 
 powerpc/powerpc/atomic.s	standard
 powerpc/powerpc/autoconf.c	standard
diff --git a/sys/conf/files.sparc64 b/sys/conf/files.sparc64
index 8562b26..20604fb 100644
--- a/sys/conf/files.sparc64
+++ b/sys/conf/files.sparc64
@@ -20,7 +20,9 @@ dev/sio/sio_isa.c		optional	sio isa
 geom/geom_bsd.c			standard
 geom/geom_sunlabel.c		standard
 libkern/ffs.c			standard
+kern/subr_disklabel.c		standard
 kern/subr_diskmbr.c		standard
+kern/subr_diskslice.c		standard
 kern/syscalls.c			optional	ktr
 sparc64/ebus/ebus.c		optional	ebus
 sparc64/isa/isa.c		optional	isa