---

yaml --- r: 315847 b: refs/heads/master c: dcce048 h: refs/heads/master i: 315845: 673b6ac 315843: a95bab2 315839: c948ee7 v: v3
git-mirror · Jun 13, 2012 · 6375a8f · 6375a8f
1 parent 0bed1b3
commit 6375a8f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cd1834591fe9564720ac4b0193bf1c790fe89f0d
+refs/heads/master: dcce0489477f07ac1331aee71f18d6274e19a9c1
diff --git a/trunk/include/trace/events/kvm.h b/trunk/include/trace/events/kvm.h
@@ -13,7 +13,8 @@
 	ERSN(DEBUG), ERSN(HLT), ERSN(MMIO), ERSN(IRQ_WINDOW_OPEN),	\
 	ERSN(SHUTDOWN), ERSN(FAIL_ENTRY), ERSN(INTR), ERSN(SET_TPR),	\
 	ERSN(TPR_ACCESS), ERSN(S390_SIEIC), ERSN(S390_RESET), ERSN(DCR),\
-	ERSN(NMI), ERSN(INTERNAL_ERROR), ERSN(OSI)
+	ERSN(NMI), ERSN(INTERNAL_ERROR), ERSN(OSI), ERSN(PAPR_HCALL),	\
+	ERSN(S390_UCONTROL)
 
 TRACE_EVENT(kvm_userspace_exit,
 	    TP_PROTO(__u32 reason, int errno),