diff options
| author | Dmitry Torokhov <[email protected]> | 2022-10-09 22:30:23 -0700 | 
|---|---|---|
| committer | Dmitry Torokhov <[email protected]> | 2022-10-09 22:30:23 -0700 | 
| commit | 5f8f8574c7f5585b09a9623f0f13462e4eb67b4d (patch) | |
| tree | 8f1d5e88bf9604a9e39fbcce0e37b3d8cee451bb /tools/lib/bpf/skel_internal.h | |
| parent | e62563db857f81d75c5726a35bc0180bed6d1540 (diff) | |
| parent | fe5b6aaef72a0f7daa06e7960e0bee45c2984e41 (diff) | |
Merge branch 'next' into for-linus
Prepare input updates for 6.1 merge window.
Diffstat (limited to 'tools/lib/bpf/skel_internal.h')
| -rw-r--r-- | tools/lib/bpf/skel_internal.h | 4 | 
1 files changed, 2 insertions, 2 deletions
| diff --git a/tools/lib/bpf/skel_internal.h b/tools/lib/bpf/skel_internal.h index bd6f4505e7b1..70adf7b119b9 100644 --- a/tools/lib/bpf/skel_internal.h +++ b/tools/lib/bpf/skel_internal.h @@ -66,13 +66,13 @@ struct bpf_load_and_run_opts {  	const char *errstr;  }; -long bpf_sys_bpf(__u32 cmd, void *attr, __u32 attr_size); +long kern_sys_bpf(__u32 cmd, void *attr, __u32 attr_size);  static inline int skel_sys_bpf(enum bpf_cmd cmd, union bpf_attr *attr,  			  unsigned int size)  {  #ifdef __KERNEL__ -	return bpf_sys_bpf(cmd, attr, size); +	return kern_sys_bpf(cmd, attr, size);  #else  	return syscall(__NR_bpf, cmd, attr, size);  #endif |