---

yaml --- r: 329824 b: refs/heads/master c: 4a4541a h: refs/heads/master v: v3
git-mirror · Jul 30, 2012 · 2c5ae83 · 2c5ae83
1 parent 5d77b50
commit 2c5ae83
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ade38c311a0ad8c32e902fe1d0ae74d0d44bc71e
+refs/heads/master: 4a4541a40e1fe145c72c4b959fac524a5600d9fb
diff --git a/trunk/arch/x86/kvm/lapic.c b/trunk/arch/x86/kvm/lapic.c
@@ -696,12 +696,14 @@ static u32 __apic_read(struct kvm_lapic *apic, unsigned int offset)
 
 		val = apic_get_tmcct(apic);
 		break;
-
+	case APIC_PROCPRI:
+		apic_update_ppr(apic);
+		val = apic_get_reg(apic, offset);
+		break;
 	case APIC_TASKPRI:
 		report_tpr_access(apic, false);
 		/* fall thru */
 	default:
-		apic_update_ppr(apic);
 		val = apic_get_reg(apic, offset);
 		break;
 	}