Cross-merge bpf fixes after downstream PR. No conflicts. Adjacent changes in: Auto-merging include/linux/bpf.h Auto-merging include/linux/bpf_verifier.h Auto-merging kernel/bpf/btf.c Auto-merging kernel/bpf/verifier.c Auto-merging kernel/trace/bpf_trace.c Auto-merging tools/testing/selftests/bpf/progs/test_tp_btf_nullable.c
Showing the changes to tools/include/uapi/linux (2 of 350 files). Show all
Unified · Split
| @@ -1158,7 +1158,15 @@ enum kvm_device_type { · 1157 unmodified lines | |||
| 1158 | #define KVM_DEV_TYPE_ARM_PV_TIME KVM_DEV_TYPE_ARM_PV_TIME | 1158 | #define KVM_DEV_TYPE_ARM_PV_TIME KVM_DEV_TYPE_ARM_PV_TIME |
| 1159 | KVM_DEV_TYPE_RISCV_AIA, | 1159 | KVM_DEV_TYPE_RISCV_AIA, |
| 1160 | #define KVM_DEV_TYPE_RISCV_AIA KVM_DEV_TYPE_RISCV_AIA | 1160 | #define KVM_DEV_TYPE_RISCV_AIA KVM_DEV_TYPE_RISCV_AIA |
| 1161 | KVM_DEV_TYPE_LOONGARCH_IPI, | ||
| 1162 | #define KVM_DEV_TYPE_LOONGARCH_IPI KVM_DEV_TYPE_LOONGARCH_IPI | ||
| 1163 | KVM_DEV_TYPE_LOONGARCH_EIOINTC, | ||
| 1164 | #define KVM_DEV_TYPE_LOONGARCH_EIOINTC KVM_DEV_TYPE_LOONGARCH_EIOINTC | ||
| 1165 | KVM_DEV_TYPE_LOONGARCH_PCHPIC, | ||
| 1166 | #define KVM_DEV_TYPE_LOONGARCH_PCHPIC KVM_DEV_TYPE_LOONGARCH_PCHPIC | ||
| 1167 | |||
| 1161 | KVM_DEV_TYPE_MAX, | 1168 | KVM_DEV_TYPE_MAX, |
| 1169 | |||
| 1162 | }; | 1170 | }; |
| 1163 | 1171 | ||
| 1164 | struct kvm_vfio_spapr_tce { | 1172 | struct kvm_vfio_spapr_tce { |
| @@ -511,7 +511,16 @@ struct perf_event_attr { · 510 unmodified lines | |||
| 511 | __u16 sample_max_stack; | 511 | __u16 sample_max_stack; |
| 512 | __u16 __reserved_2; | 512 | __u16 __reserved_2; |
| 513 | __u32 aux_sample_size; | 513 | __u32 aux_sample_size; |
| 514 | __u32 __reserved_3; | 514 | |
| 515 | union { | ||
| 516 | __u32 aux_action; | ||
| 517 | struct { | ||
| 518 | __u32 aux_start_paused : 1, /* start AUX area tracing paused */ | ||
| 519 | aux_pause : 1, /* on overflow, pause AUX area tracing */ | ||
| 520 | aux_resume : 1, /* on overflow, resume AUX area tracing */ | ||
| 521 | __reserved_3 : 29; | ||
| 522 | }; | ||
| 523 | }; | ||
| 515 | 524 | ||
| 516 | /* | 525 | /* |
| 517 | * User provided data if sigtrap=1, passed back to user via | 526 | * User provided data if sigtrap=1, passed back to user via |