Merge branch 'kvm-tsx-ctrl' into HEAD
Conflicts: arch/x86/kvm/vmx/vmx.c
This commit is contained in:
@@ -292,7 +292,7 @@ struct pmu {
|
||||
* -EBUSY -- @event is for this PMU but PMU temporarily unavailable
|
||||
* -EINVAL -- @event is for this PMU but @event is not valid
|
||||
* -EOPNOTSUPP -- @event is for this PMU, @event is valid, but not supported
|
||||
* -EACCESS -- @event is for this PMU, @event is valid, but no privilidges
|
||||
* -EACCES -- @event is for this PMU, @event is valid, but no privileges
|
||||
*
|
||||
* 0 -- @event is for this PMU and valid
|
||||
*
|
||||
|
Reference in New Issue
Block a user