diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2021-06-23 12:43:45 +0300 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2021-06-23 14:30:41 +0300 |
| commit | c3ab0e28a437c213e5e2c1d890f3891b6952b9ca (patch) | |
| tree | 8246e6614acd941b07c0925dea03b97f3ae1f3a7 /include/uapi | |
| parent | ba1f82456ba8438a8abc96274d57bfe76d34a4a8 (diff) | |
| parent | 51696f39cbee5bb684e7959c0c98b5f54548aa34 (diff) | |
| download | linux-c3ab0e28a437c213e5e2c1d890f3891b6952b9ca.tar.xz | |
Merge branch 'topic/ppc-kvm' of https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux into HEAD
- Support for the H_RPT_INVALIDATE hypercall
- Conversion of Book3S entry/exit to C
- Bug fixes
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/linux/fs.h | 2 | ||||
| -rw-r--r-- | include/uapi/linux/kvm.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/uapi/linux/fs.h b/include/uapi/linux/fs.h index f44eb0a04afd..4c32e97dcdf0 100644 --- a/include/uapi/linux/fs.h +++ b/include/uapi/linux/fs.h @@ -185,7 +185,7 @@ struct fsxattr { #define BLKROTATIONAL _IO(0x12,126) #define BLKZEROOUT _IO(0x12,127) /* - * A jump here: 130-131 are reserved for zoned block devices + * A jump here: 130-136 are reserved for zoned block devices * (see uapi/linux/blkzoned.h) */ diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h index 9febe1412f7a..330835f1005b 100644 --- a/include/uapi/linux/kvm.h +++ b/include/uapi/linux/kvm.h @@ -1086,6 +1086,7 @@ struct kvm_ppc_resize_hpt { #define KVM_CAP_HYPERV_ENFORCE_CPUID 199 #define KVM_CAP_SREGS2 200 #define KVM_CAP_EXIT_HYPERCALL 201 +#define KVM_CAP_PPC_RPT_INVALIDATE 202 #ifdef KVM_CAP_IRQ_ROUTING |