diff --git a/[refs] b/[refs]
index d6e1ebbe24e0..125792a8a4e4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 21bd000abff7d587229dbbee6f8c17f3aad9f9d8
+refs/heads/master: d35b1075afc0172caa44b57b56a2b9b57e06d32e
diff --git a/trunk/Documentation/virtual/kvm/ppc-pv.txt b/trunk/Documentation/virtual/kvm/ppc-pv.txt
index 6e7c37050930..4911cf95c67e 100644
--- a/trunk/Documentation/virtual/kvm/ppc-pv.txt
+++ b/trunk/Documentation/virtual/kvm/ppc-pv.txt
@@ -109,8 +109,6 @@ The following bits are safe to be set inside the guest:
 
   MSR_EE
   MSR_RI
-  MSR_CR
-  MSR_ME
 
 If any other bit changes in the MSR, please still use mtmsr(d).
 
diff --git a/trunk/arch/powerpc/kernel/kvm_emul.S b/trunk/arch/powerpc/kernel/kvm_emul.S
index 62ceb2ac82cf..e100ff324a85 100644
--- a/trunk/arch/powerpc/kernel/kvm_emul.S
+++ b/trunk/arch/powerpc/kernel/kvm_emul.S
@@ -122,7 +122,7 @@ kvm_emulate_mtmsrd_len:
 	.long (kvm_emulate_mtmsrd_end - kvm_emulate_mtmsrd) / 4
 
 
-#define MSR_SAFE_BITS (MSR_EE | MSR_CE | MSR_ME | MSR_RI)
+#define MSR_SAFE_BITS (MSR_EE | MSR_RI)
 #define MSR_CRITICAL_BITS ~MSR_SAFE_BITS
 
 .global kvm_emulate_mtmsr