Index: kernel/arch/sparc64/src/sun4v/sparc64.c
===================================================================
--- kernel/arch/sparc64/src/sun4v/sparc64.c	(revision 36df41093d27358efd761887622e3076ed51cd14)
+++ kernel/arch/sparc64/src/sun4v/sparc64.c	(revision 741b2fb1909363f2ca0ec5f58957ea347df82946)
@@ -55,15 +55,15 @@
 #include <sysinfo/sysinfo.h>
 
-static void sparc64_pre_mm_init(void);
-static void sparc64_post_mm_init(void);
-static void sparc64_post_smp_init(void);
+static void sun4v_pre_mm_init(void);
+static void sun4v_post_mm_init(void);
+static void sun4v_post_smp_init(void);
 
-arch_ops_t sparc64_ops = {
-	.pre_mm_init = sparc64_pre_mm_init,
-	.post_mm_init = sparc64_post_mm_init,
-	.post_smp_init = sparc64_post_smp_init,
+arch_ops_t sun4v_ops = {
+	.pre_mm_init = sun4v_pre_mm_init,
+	.post_mm_init = sun4v_post_mm_init,
+	.post_smp_init = sun4v_post_smp_init,
 };
 
-arch_ops_t *arch_ops = &sparc64_ops;
+arch_ops_t *sparc64_ops = &sun4v_ops;
 
 memmap_t memmap;
@@ -95,5 +95,5 @@
 
 /** Perform sparc64 specific initialization before mm is initialized. */
-void sparc64_pre_mm_init(void)
+void sun4v_pre_mm_init(void)
 {
 	if (config.cpu_active == 1) {
@@ -104,5 +104,5 @@
 
 /** Perform sparc64 specific initialization afterr mm is initialized. */
-void sparc64_post_mm_init(void)
+void sun4v_post_mm_init(void)
 {
 	if (config.cpu_active == 1) {
@@ -118,5 +118,5 @@
 }
 
-void sparc64_post_smp_init(void)
+void sun4v_post_smp_init(void)
 {
 	/* Currently the only supported platform for sparc64/sun4v is 'sun4v'. */