diff options
Diffstat (limited to 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/keyctl.h | 2 | ||||
| -rw-r--r-- | include/uapi/linux/kvm.h | 1 | ||||
| -rw-r--r-- | include/uapi/linux/perf_event.h | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/include/uapi/linux/keyctl.h b/include/uapi/linux/keyctl.h index 910cc4334b21..7b8c9e19bad1 100644 --- a/include/uapi/linux/keyctl.h +++ b/include/uapi/linux/keyctl.h | |||
| @@ -65,7 +65,7 @@ | |||
| 65 | 65 | ||
| 66 | /* keyctl structures */ | 66 | /* keyctl structures */ |
| 67 | struct keyctl_dh_params { | 67 | struct keyctl_dh_params { |
| 68 | __s32 dh_private; | 68 | __s32 private; |
| 69 | __s32 prime; | 69 | __s32 prime; |
| 70 | __s32 base; | 70 | __s32 base; |
| 71 | }; | 71 | }; |
diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h index 07548de5c988..251be353f950 100644 --- a/include/uapi/linux/kvm.h +++ b/include/uapi/linux/kvm.h | |||
| @@ -952,6 +952,7 @@ struct kvm_ppc_resize_hpt { | |||
| 952 | #define KVM_CAP_S390_HPAGE_1M 156 | 952 | #define KVM_CAP_S390_HPAGE_1M 156 |
| 953 | #define KVM_CAP_NESTED_STATE 157 | 953 | #define KVM_CAP_NESTED_STATE 157 |
| 954 | #define KVM_CAP_ARM_INJECT_SERROR_ESR 158 | 954 | #define KVM_CAP_ARM_INJECT_SERROR_ESR 158 |
| 955 | #define KVM_CAP_MSR_PLATFORM_INFO 159 | ||
| 955 | 956 | ||
| 956 | #ifdef KVM_CAP_IRQ_ROUTING | 957 | #ifdef KVM_CAP_IRQ_ROUTING |
| 957 | 958 | ||
diff --git a/include/uapi/linux/perf_event.h b/include/uapi/linux/perf_event.h index eeb787b1c53c..f35eb72739c0 100644 --- a/include/uapi/linux/perf_event.h +++ b/include/uapi/linux/perf_event.h | |||
| @@ -144,7 +144,7 @@ enum perf_event_sample_format { | |||
| 144 | 144 | ||
| 145 | PERF_SAMPLE_MAX = 1U << 20, /* non-ABI */ | 145 | PERF_SAMPLE_MAX = 1U << 20, /* non-ABI */ |
| 146 | 146 | ||
| 147 | __PERF_SAMPLE_CALLCHAIN_EARLY = 1ULL << 63, | 147 | __PERF_SAMPLE_CALLCHAIN_EARLY = 1ULL << 63, /* non-ABI; internal use */ |
| 148 | }; | 148 | }; |
| 149 | 149 | ||
| 150 | /* | 150 | /* |
