From 346532d711f67b5f444ab91de7a13360d18360df Mon Sep 17 00:00:00 2001 From: Andrii Nakryiko Date: Fri, 13 Jun 2025 13:01:36 -0700 Subject: [PATCH] sync: one-time strip out _UAPI prefix from UAPI header guards Normalize already synced UAPI headers. For all subsequent syncs this will be done automatically by the sync script. Signed-off-by: Andrii Nakryiko --- include/uapi/linux/bpf.h | 6 +++--- include/uapi/linux/bpf_common.h | 6 +++--- include/uapi/linux/btf.h | 6 +++--- include/uapi/linux/netlink.h | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h index 16e9539..bf58628 100644 --- a/include/uapi/linux/bpf.h +++ b/include/uapi/linux/bpf.h @@ -5,8 +5,8 @@ * modify it under the terms of version 2 of the GNU General Public * License as published by the Free Software Foundation. */ -#ifndef _UAPI__LINUX_BPF_H__ -#define _UAPI__LINUX_BPF_H__ +#ifndef __LINUX_BPF_H__ +#define __LINUX_BPF_H__ #include #include @@ -7575,4 +7575,4 @@ enum bpf_kfunc_flags { BPF_F_PAD_ZEROS = (1ULL << 0), }; -#endif /* _UAPI__LINUX_BPF_H__ */ +#endif /* __LINUX_BPF_H__ */ diff --git a/include/uapi/linux/bpf_common.h b/include/uapi/linux/bpf_common.h index ee97668..f0fe139 100644 --- a/include/uapi/linux/bpf_common.h +++ b/include/uapi/linux/bpf_common.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ -#ifndef _UAPI__LINUX_BPF_COMMON_H__ -#define _UAPI__LINUX_BPF_COMMON_H__ +#ifndef __LINUX_BPF_COMMON_H__ +#define __LINUX_BPF_COMMON_H__ /* Instruction classes */ #define BPF_CLASS(code) ((code) & 0x07) @@ -54,4 +54,4 @@ #define BPF_MAXINSNS 4096 #endif -#endif /* _UAPI__LINUX_BPF_COMMON_H__ */ +#endif /* __LINUX_BPF_COMMON_H__ */ diff --git a/include/uapi/linux/btf.h b/include/uapi/linux/btf.h index 266d4ff..ffba4eb 100644 --- a/include/uapi/linux/btf.h +++ b/include/uapi/linux/btf.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ /* Copyright (c) 2018 Facebook */ -#ifndef _UAPI__LINUX_BTF_H__ -#define _UAPI__LINUX_BTF_H__ +#ifndef __LINUX_BTF_H__ +#define __LINUX_BTF_H__ #include @@ -198,4 +198,4 @@ struct btf_enum64 { __u32 val_hi32; }; -#endif /* _UAPI__LINUX_BTF_H__ */ +#endif /* __LINUX_BTF_H__ */ diff --git a/include/uapi/linux/netlink.h b/include/uapi/linux/netlink.h index 0a4d733..b857821 100644 --- a/include/uapi/linux/netlink.h +++ b/include/uapi/linux/netlink.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ -#ifndef _UAPI__LINUX_NETLINK_H -#define _UAPI__LINUX_NETLINK_H +#ifndef __LINUX_NETLINK_H +#define __LINUX_NETLINK_H #include #include /* for __kernel_sa_family_t */ @@ -249,4 +249,4 @@ struct nla_bitfield32 { __u32 selector; }; -#endif /* _UAPI__LINUX_NETLINK_H */ +#endif /* __LINUX_NETLINK_H */