diff --git a/[refs] b/[refs]
index ebeb1ba87b01..69849e02b835 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 50f4f23c3bd95afc82e931254a71e7b1b3699fd2
+refs/heads/master: 4a07e646c55be118442e464b7a2a9682c7131d9a
diff --git a/trunk/arch/sparc64/kernel/smp.c b/trunk/arch/sparc64/kernel/smp.c
index 2dbe008d6b7a..c280e6742b25 100644
--- a/trunk/arch/sparc64/kernel/smp.c
+++ b/trunk/arch/sparc64/kernel/smp.c
@@ -122,10 +122,8 @@ void __init smp_callin(void)
 
 	__local_per_cpu_offset = __per_cpu_offset(cpuid);
 
-	if (tlb_type == hypervisor) {
-		sun4v_register_fault_status();
+	if (tlb_type == hypervisor)
 		sun4v_ktsb_register();
-	}
 
 	__flush_tlb_all();