---

yaml --- r: 315841 b: refs/heads/master c: d35b107 h: refs/heads/master i: 315839: c948ee7 v: v3
git-mirror · May 30, 2012 · 897030c · 897030c
1 parent cda697b
commit 897030c
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
-Original file line number
+Diff line change
@@ Expand Up / @@ -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).
@@ Expand Down @@