14 files changed, 10 insertions, 10 deletions

diff --git a/sys/conf/files.sun4v b/sys/conf/files.sun4v
index d073b66953a8..ea9c8f00c023 100644
--- a/sys/conf/files.sun4v
+++ b/sys/conf/files.sun4v
@@ -72,7 +72,7 @@ sun4v/sun4v/mp_exception.S	optional	smp
 sun4v/sun4v/mp_locore.S	optional	smp
 sun4v/sun4v/mp_machdep.c	optional	smp
 sun4v/sun4v/nexus.c		standard
-sun4v/sun4v/t1_copy.S	standard
+sun4v/cddl/t1_copy.S	standard
 sparc64/sparc64/ofw_bus.c	standard
 sparc64/sparc64/ofw_machdep.c	standard
 sun4v/sun4v/pmap.c		standard
@@ -94,15 +94,15 @@ sun4v/sun4v/vnex.c		standard
 
 
 sun4v/mdesc/mdesc_bus_if.m	standard
-sun4v/mdesc/mdesc_scandag.c	standard
 sun4v/mdesc/mdesc_init.c	standard
-sun4v/mdesc/mdesc_init_intern.c	standard
 sun4v/mdesc/mdesc_subr.c	standard
 sun4v/mdesc/mdesc_bus_subr.c	standard
-sun4v/mdesc/mdesc_getpropstr.c	standard
-sun4v/mdesc/mdesc_getpropval.c	standard
-sun4v/mdesc/mdesc_rootnode.c	standard
-sun4v/mdesc/mdesc_findname.c	standard
-sun4v/mdesc/mdesc_nodecount.c	standard
-sun4v/mdesc/mdesc_findnodeprop.c	standard
+sun4v/cddl/mdesc/mdesc_findname.c	standard
+sun4v/cddl/mdesc/mdesc_getpropstr.c	standard
+sun4v/cddl/mdesc/mdesc_getpropval.c	standard
+sun4v/cddl/mdesc/mdesc_init_intern.c	standard
+sun4v/cddl/mdesc/mdesc_nodecount.c	standard
+sun4v/cddl/mdesc/mdesc_findnodeprop.c	standard
+sun4v/cddl/mdesc/mdesc_rootnode.c	standard
+sun4v/cddl/mdesc/mdesc_scandag.c	standard
 sun4v/mdesc/mdesc_vdevfindval.c	standard
diff --git a/sys/sun4v/mdesc/mdesc_diff.c b/sys/sun4v/cddl/mdesc/mdesc_diff.c
index 115016e9ab1a..4bd2334730c7 100644
--- a/sys/sun4v/mdesc/mdesc_diff.c
+++ b/sys/sun4v/cddl/mdesc/mdesc_diff.c
@@ -17,7 +17,7 @@
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
- * $FreeBSD$ 
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/sun4v/mdesc/mdesc_findname.c b/sys/sun4v/cddl/mdesc/mdesc_findname.c
index c9616192a113..c9616192a113 100644
--- a/sys/sun4v/mdesc/mdesc_findname.c
+++ b/sys/sun4v/cddl/mdesc/mdesc_findname.c
diff --git a/sys/sun4v/mdesc/mdesc_findnodeprop.c b/sys/sun4v/cddl/mdesc/mdesc_findnodeprop.c
index 558b97631b17..558b97631b17 100644
--- a/sys/sun4v/mdesc/mdesc_findnodeprop.c
+++ b/sys/sun4v/cddl/mdesc/mdesc_findnodeprop.c
diff --git a/sys/sun4v/mdesc/mdesc_fini.c b/sys/sun4v/cddl/mdesc/mdesc_fini.c
index ff32ce8c8b50..ff32ce8c8b50 100644
--- a/sys/sun4v/mdesc/mdesc_fini.c
+++ b/sys/sun4v/cddl/mdesc/mdesc_fini.c
diff --git a/sys/sun4v/mdesc/mdesc_getbinsize.c b/sys/sun4v/cddl/mdesc/mdesc_getbinsize.c
index c3e2386c86e7..c3e2386c86e7 100644
--- a/sys/sun4v/mdesc/mdesc_getbinsize.c
+++ b/sys/sun4v/cddl/mdesc/mdesc_getbinsize.c
diff --git a/sys/sun4v/mdesc/mdesc_getgen.c b/sys/sun4v/cddl/mdesc/mdesc_getgen.c
index 7d1ad5198b46..7d1ad5198b46 100644
--- a/sys/sun4v/mdesc/mdesc_getgen.c
+++ b/sys/sun4v/cddl/mdesc/mdesc_getgen.c
diff --git a/sys/sun4v/mdesc/mdesc_getpropdata.c b/sys/sun4v/cddl/mdesc/mdesc_getpropdata.c
index 199a4362e498..199a4362e498 100644
--- a/sys/sun4v/mdesc/mdesc_getpropdata.c
+++ b/sys/sun4v/cddl/mdesc/mdesc_getpropdata.c
diff --git a/sys/sun4v/mdesc/mdesc_getpropstr.c b/sys/sun4v/cddl/mdesc/mdesc_getpropstr.c
index 61f9c307884f..61f9c307884f 100644
--- a/sys/sun4v/mdesc/mdesc_getpropstr.c
+++ b/sys/sun4v/cddl/mdesc/mdesc_getpropstr.c
diff --git a/sys/sun4v/mdesc/mdesc_getpropval.c b/sys/sun4v/cddl/mdesc/mdesc_getpropval.c
index 3a17d5c7b01d..3a17d5c7b01d 100644
--- a/sys/sun4v/mdesc/mdesc_getpropval.c
+++ b/sys/sun4v/cddl/mdesc/mdesc_getpropval.c
diff --git a/sys/sun4v/mdesc/mdesc_init_intern.c b/sys/sun4v/cddl/mdesc/mdesc_init_intern.c
index dd5973e067f3..dd5973e067f3 100644
--- a/sys/sun4v/mdesc/mdesc_init_intern.c
+++ b/sys/sun4v/cddl/mdesc/mdesc_init_intern.c
diff --git a/sys/sun4v/mdesc/mdesc_nodecount.c b/sys/sun4v/cddl/mdesc/mdesc_nodecount.c
index 1c0376d5138e..1c0376d5138e 100644
--- a/sys/sun4v/mdesc/mdesc_nodecount.c
+++ b/sys/sun4v/cddl/mdesc/mdesc_nodecount.c
diff --git a/sys/sun4v/mdesc/mdesc_rootnode.c b/sys/sun4v/cddl/mdesc/mdesc_rootnode.c
index 2e4437aa131d..2e4437aa131d 100644
--- a/sys/sun4v/mdesc/mdesc_rootnode.c
+++ b/sys/sun4v/cddl/mdesc/mdesc_rootnode.c
diff --git a/sys/sun4v/mdesc/mdesc_scandag.c b/sys/sun4v/cddl/mdesc/mdesc_scandag.c
index 4d7716a14cae..4d7716a14cae 100644
--- a/sys/sun4v/mdesc/mdesc_scandag.c
+++ b/sys/sun4v/cddl/mdesc/mdesc_scandag.c