After the SPDX license tags were added a number of tooling headers got out of sync with their kernel variants, generating lots of build warnings. Sync them: - tools/arch/x86/include/asm/disabled-features.h, tools/arch/x86/include/asm/required-features.h, tools/include/linux/hash.h: Remove the SPDX tag where the kernel version does not have it. - tools/include/asm-generic/bitops/__fls.h, tools/include/asm-generic/bitops/arch_hweight.h, tools/include/asm-generic/bitops/const_hweight.h, tools/include/asm-generic/bitops/fls.h, tools/include/asm-generic/bitops/fls64.h, tools/include/uapi/asm-generic/ioctls.h, tools/include/uapi/asm-generic/mman-common.h, tools/include/uapi/sound/asound.h, tools/include/uapi/linux/kvm.h, tools/include/uapi/linux/perf_event.h, tools/include/uapi/linux/sched.h, tools/include/uapi/linux/vhost.h, tools/include/uapi/sound/asound.h: Add the SPDX tag of the respective kernel header. - tools/include/uapi/linux/bpf_common.h, tools/include/uapi/linux/fcntl.h, tools/include/uapi/linux/hw_breakpoint.h, tools/include/uapi/linux/mman.h, tools/include/uapi/linux/stat.h, Change the tag to the kernel header version: -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ Also sync other header details: - include/uapi/sound/asound.h: Fix pointless end of line whitespace noise the header grew in this cycle. - tools/arch/x86/lib/memcpy_64.S: Sync the code and add tools/include/asm/export.h with dummy wrappers to support building the kernel side code in a tooling header environment. - tools/include/uapi/asm-generic/mman.h, tools/include/uapi/linux/bpf.h: Sync other details that don't impact tooling's use of the ABIs.
Showing the changes to tools/include/uapi/linux (10 of 26 files). Show all
Unified · Split
| @@ -1,3 +1,4 @@ | ||
| 1 | +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ | |
| 1 | 2 | /* Copyright (c) 2011-2014 PLUMgrid, http://plumgrid.com |
| 2 | 3 | * |
| 3 | 4 | * This program is free software; you can redistribute it and/or |
| @@ -569,10 +570,9 @@ union bpf_attr { · 565 unmodified lines | ||
| 569 | 570 | * @flags: reserved for future use |
| 570 | 571 | * Return: 0 on success or negative error code |
| 571 | 572 | * |
| 572 | − * int bpf_sk_redirect_map(skb, map, key, flags) | |
| 573 | + * int bpf_sk_redirect_map(map, key, flags) | |
| 573 | 574 | * Redirect skb to a sock in map using key as a lookup key for the |
| 574 | 575 | * sock in map. |
| 575 | − * @skb: pointer to skb | |
| 576 | 576 | * @map: pointer to sockmap |
| 577 | 577 | * @key: key to lookup sock in map |
| 578 | 578 | * @flags: reserved for future use |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* SPDX-License-Identifier: GPL-2.0 */ | |
| 1 | +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ | |
| 2 | 2 | #ifndef _UAPI__LINUX_BPF_COMMON_H__ |
| 3 | 3 | #define _UAPI__LINUX_BPF_COMMON_H__ |
| 4 | 4 | |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* SPDX-License-Identifier: GPL-2.0 */ | |
| 1 | +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ | |
| 2 | 2 | #ifndef _UAPI_LINUX_FCNTL_H |
| 3 | 3 | #define _UAPI_LINUX_FCNTL_H |
| 4 | 4 | |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* SPDX-License-Identifier: GPL-2.0 */ | |
| 1 | +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ | |
| 2 | 2 | #ifndef _UAPI_LINUX_HW_BREAKPOINT_H |
| 3 | 3 | #define _UAPI_LINUX_HW_BREAKPOINT_H |
| 4 | 4 | |
| @@ -1,3 +1,4 @@ | ||
| 1 | +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ | |
| 1 | 2 | #ifndef __LINUX_KVM_H |
| 2 | 3 | #define __LINUX_KVM_H |
| 3 | 4 | |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* SPDX-License-Identifier: GPL-2.0 */ | |
| 1 | +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ | |
| 2 | 2 | #ifndef _UAPI_LINUX_MMAN_H |
| 3 | 3 | #define _UAPI_LINUX_MMAN_H |
| 4 | 4 | |
| @@ -1,3 +1,4 @@ | ||
| 1 | +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ | |
| 1 | 2 | /* |
| 2 | 3 | * Performance events: |
| 3 | 4 | * |
| @@ -1,3 +1,4 @@ | ||
| 1 | +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ | |
| 1 | 2 | #ifndef _UAPI_LINUX_SCHED_H |
| 2 | 3 | #define _UAPI_LINUX_SCHED_H |
| 3 | 4 | |
| @@ -1,4 +1,4 @@ | ||
| 1 | −/* SPDX-License-Identifier: GPL-2.0 */ | |
| 1 | +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ | |
| 2 | 2 | #ifndef _UAPI_LINUX_STAT_H |
| 3 | 3 | #define _UAPI_LINUX_STAT_H |
| 4 | 4 | |
| @@ -1,3 +1,4 @@ | ||
| 1 | +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ | |
| 1 | 2 | #ifndef _LINUX_VHOST_H |
| 2 | 3 | #define _LINUX_VHOST_H |
| 3 | 4 | /* Userspace interface for in-kernel virtio accelerators. */ |