mirror of
https://github.com/torvalds/linux.git
synced 2026-11-07 06:17:02 +01:00
tools/headers: Synchronize kernel ABI headers
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.
Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
parent
294cbd05e3
commit
fb7df12d64
|
|
@ -1,4 +1,3 @@
|
||||||
/* SPDX-License-Identifier: GPL-2.0 */
|
|
||||||
#ifndef _ASM_X86_DISABLED_FEATURES_H
|
#ifndef _ASM_X86_DISABLED_FEATURES_H
|
||||||
#define _ASM_X86_DISABLED_FEATURES_H
|
#define _ASM_X86_DISABLED_FEATURES_H
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,3 @@
|
||||||
/* SPDX-License-Identifier: GPL-2.0 */
|
|
||||||
#ifndef _ASM_X86_REQUIRED_FEATURES_H
|
#ifndef _ASM_X86_REQUIRED_FEATURES_H
|
||||||
#define _ASM_X86_REQUIRED_FEATURES_H
|
#define _ASM_X86_REQUIRED_FEATURES_H
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,4 @@
|
||||||
|
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
|
||||||
#ifndef _UAPI_ASM_X86_UNISTD_H
|
#ifndef _UAPI_ASM_X86_UNISTD_H
|
||||||
#define _UAPI_ASM_X86_UNISTD_H
|
#define _UAPI_ASM_X86_UNISTD_H
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,10 @@
|
||||||
/* SPDX-License-Identifier: GPL-2.0 */
|
|
||||||
/* Copyright 2002 Andi Kleen */
|
/* Copyright 2002 Andi Kleen */
|
||||||
|
|
||||||
#include <linux/linkage.h>
|
#include <linux/linkage.h>
|
||||||
#include <asm/errno.h>
|
#include <asm/errno.h>
|
||||||
#include <asm/cpufeatures.h>
|
#include <asm/cpufeatures.h>
|
||||||
#include <asm/alternative-asm.h>
|
#include <asm/alternative-asm.h>
|
||||||
|
#include <asm/export.h>
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* We build a jump to memcpy_orig by default which gets NOPped out on
|
* We build a jump to memcpy_orig by default which gets NOPped out on
|
||||||
|
|
@ -41,6 +41,8 @@ ENTRY(memcpy)
|
||||||
ret
|
ret
|
||||||
ENDPROC(memcpy)
|
ENDPROC(memcpy)
|
||||||
ENDPROC(__memcpy)
|
ENDPROC(__memcpy)
|
||||||
|
EXPORT_SYMBOL(memcpy)
|
||||||
|
EXPORT_SYMBOL(__memcpy)
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* memcpy_erms() - enhanced fast string memcpy. This is faster and
|
* memcpy_erms() - enhanced fast string memcpy. This is faster and
|
||||||
|
|
@ -275,6 +277,7 @@ ENTRY(memcpy_mcsafe_unrolled)
|
||||||
xorq %rax, %rax
|
xorq %rax, %rax
|
||||||
ret
|
ret
|
||||||
ENDPROC(memcpy_mcsafe_unrolled)
|
ENDPROC(memcpy_mcsafe_unrolled)
|
||||||
|
EXPORT_SYMBOL_GPL(memcpy_mcsafe_unrolled)
|
||||||
|
|
||||||
.section .fixup, "ax"
|
.section .fixup, "ax"
|
||||||
/* Return -EFAULT for any failure */
|
/* Return -EFAULT for any failure */
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,4 @@
|
||||||
|
/* SPDX-License-Identifier: GPL-2.0 */
|
||||||
#ifndef _ASM_GENERIC_BITOPS___FLS_H_
|
#ifndef _ASM_GENERIC_BITOPS___FLS_H_
|
||||||
#define _ASM_GENERIC_BITOPS___FLS_H_
|
#define _ASM_GENERIC_BITOPS___FLS_H_
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,4 @@
|
||||||
|
/* SPDX-License-Identifier: GPL-2.0 */
|
||||||
#ifndef _ASM_GENERIC_BITOPS_ARCH_HWEIGHT_H_
|
#ifndef _ASM_GENERIC_BITOPS_ARCH_HWEIGHT_H_
|
||||||
#define _ASM_GENERIC_BITOPS_ARCH_HWEIGHT_H_
|
#define _ASM_GENERIC_BITOPS_ARCH_HWEIGHT_H_
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,4 @@
|
||||||
|
/* SPDX-License-Identifier: GPL-2.0 */
|
||||||
#ifndef _ASM_GENERIC_BITOPS_CONST_HWEIGHT_H_
|
#ifndef _ASM_GENERIC_BITOPS_CONST_HWEIGHT_H_
|
||||||
#define _ASM_GENERIC_BITOPS_CONST_HWEIGHT_H_
|
#define _ASM_GENERIC_BITOPS_CONST_HWEIGHT_H_
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,4 @@
|
||||||
|
/* SPDX-License-Identifier: GPL-2.0 */
|
||||||
#ifndef _ASM_GENERIC_BITOPS_FLS_H_
|
#ifndef _ASM_GENERIC_BITOPS_FLS_H_
|
||||||
#define _ASM_GENERIC_BITOPS_FLS_H_
|
#define _ASM_GENERIC_BITOPS_FLS_H_
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,4 @@
|
||||||
|
/* SPDX-License-Identifier: GPL-2.0 */
|
||||||
#ifndef _ASM_GENERIC_BITOPS_FLS64_H_
|
#ifndef _ASM_GENERIC_BITOPS_FLS64_H_
|
||||||
#define _ASM_GENERIC_BITOPS_FLS64_H_
|
#define _ASM_GENERIC_BITOPS_FLS64_H_
|
||||||
|
|
||||||
|
|
|
||||||
7
tools/include/asm/export.h
Normal file
7
tools/include/asm/export.h
Normal file
|
|
@ -0,0 +1,7 @@
|
||||||
|
#ifndef _TOOLS_ASM_EXPORT_H
|
||||||
|
#define _TOOLS_ASM_EXPORT_H
|
||||||
|
|
||||||
|
#define EXPORT_SYMBOL(x)
|
||||||
|
#define EXPORT_SYMBOL_GPL(x)
|
||||||
|
|
||||||
|
#endif /* _TOOLS_ASM_EXPORT_H */
|
||||||
|
|
@ -1,4 +1,3 @@
|
||||||
/* SPDX-License-Identifier: GPL-2.0 */
|
|
||||||
#ifndef _LINUX_HASH_H
|
#ifndef _LINUX_HASH_H
|
||||||
#define _LINUX_HASH_H
|
#define _LINUX_HASH_H
|
||||||
/* Fast hashing routine for ints, longs and pointers.
|
/* Fast hashing routine for ints, longs and pointers.
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,4 @@
|
||||||
|
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
|
||||||
#ifndef __ASM_GENERIC_IOCTLS_H
|
#ifndef __ASM_GENERIC_IOCTLS_H
|
||||||
#define __ASM_GENERIC_IOCTLS_H
|
#define __ASM_GENERIC_IOCTLS_H
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,4 @@
|
||||||
|
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
|
||||||
#ifndef __ASM_GENERIC_MMAN_COMMON_H
|
#ifndef __ASM_GENERIC_MMAN_COMMON_H
|
||||||
#define __ASM_GENERIC_MMAN_COMMON_H
|
#define __ASM_GENERIC_MMAN_COMMON_H
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
/* SPDX-License-Identifier: GPL-2.0 */
|
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
|
||||||
#ifndef __ASM_GENERIC_MMAN_H
|
#ifndef __ASM_GENERIC_MMAN_H
|
||||||
#define __ASM_GENERIC_MMAN_H
|
#define __ASM_GENERIC_MMAN_H
|
||||||
|
|
||||||
#include <uapi/asm-generic/mman-common.h>
|
#include <asm-generic/mman-common.h>
|
||||||
|
|
||||||
#define MAP_GROWSDOWN 0x0100 /* stack-like segment */
|
#define MAP_GROWSDOWN 0x0100 /* stack-like segment */
|
||||||
#define MAP_DENYWRITE 0x0800 /* ETXTBSY */
|
#define MAP_DENYWRITE 0x0800 /* ETXTBSY */
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,4 @@
|
||||||
|
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
|
||||||
/* Copyright (c) 2011-2014 PLUMgrid, http://plumgrid.com
|
/* Copyright (c) 2011-2014 PLUMgrid, http://plumgrid.com
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or
|
* This program is free software; you can redistribute it and/or
|
||||||
|
|
@ -569,10 +570,9 @@ union bpf_attr {
|
||||||
* @flags: reserved for future use
|
* @flags: reserved for future use
|
||||||
* Return: 0 on success or negative error code
|
* Return: 0 on success or negative error code
|
||||||
*
|
*
|
||||||
* int bpf_sk_redirect_map(skb, map, key, flags)
|
* int bpf_sk_redirect_map(map, key, flags)
|
||||||
* Redirect skb to a sock in map using key as a lookup key for the
|
* Redirect skb to a sock in map using key as a lookup key for the
|
||||||
* sock in map.
|
* sock in map.
|
||||||
* @skb: pointer to skb
|
|
||||||
* @map: pointer to sockmap
|
* @map: pointer to sockmap
|
||||||
* @key: key to lookup sock in map
|
* @key: key to lookup sock in map
|
||||||
* @flags: reserved for future use
|
* @flags: reserved for future use
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
/* SPDX-License-Identifier: GPL-2.0 */
|
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
|
||||||
#ifndef _UAPI__LINUX_BPF_COMMON_H__
|
#ifndef _UAPI__LINUX_BPF_COMMON_H__
|
||||||
#define _UAPI__LINUX_BPF_COMMON_H__
|
#define _UAPI__LINUX_BPF_COMMON_H__
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
/* SPDX-License-Identifier: GPL-2.0 */
|
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
|
||||||
#ifndef _UAPI_LINUX_FCNTL_H
|
#ifndef _UAPI_LINUX_FCNTL_H
|
||||||
#define _UAPI_LINUX_FCNTL_H
|
#define _UAPI_LINUX_FCNTL_H
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
/* SPDX-License-Identifier: GPL-2.0 */
|
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
|
||||||
#ifndef _UAPI_LINUX_HW_BREAKPOINT_H
|
#ifndef _UAPI_LINUX_HW_BREAKPOINT_H
|
||||||
#define _UAPI_LINUX_HW_BREAKPOINT_H
|
#define _UAPI_LINUX_HW_BREAKPOINT_H
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,4 @@
|
||||||
|
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
|
||||||
#ifndef __LINUX_KVM_H
|
#ifndef __LINUX_KVM_H
|
||||||
#define __LINUX_KVM_H
|
#define __LINUX_KVM_H
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
/* SPDX-License-Identifier: GPL-2.0 */
|
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
|
||||||
#ifndef _UAPI_LINUX_MMAN_H
|
#ifndef _UAPI_LINUX_MMAN_H
|
||||||
#define _UAPI_LINUX_MMAN_H
|
#define _UAPI_LINUX_MMAN_H
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,4 @@
|
||||||
|
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
|
||||||
/*
|
/*
|
||||||
* Performance events:
|
* Performance events:
|
||||||
*
|
*
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,4 @@
|
||||||
|
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
|
||||||
#ifndef _UAPI_LINUX_SCHED_H
|
#ifndef _UAPI_LINUX_SCHED_H
|
||||||
#define _UAPI_LINUX_SCHED_H
|
#define _UAPI_LINUX_SCHED_H
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
/* SPDX-License-Identifier: GPL-2.0 */
|
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
|
||||||
#ifndef _UAPI_LINUX_STAT_H
|
#ifndef _UAPI_LINUX_STAT_H
|
||||||
#define _UAPI_LINUX_STAT_H
|
#define _UAPI_LINUX_STAT_H
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,4 @@
|
||||||
|
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
|
||||||
#ifndef _LINUX_VHOST_H
|
#ifndef _LINUX_VHOST_H
|
||||||
#define _LINUX_VHOST_H
|
#define _LINUX_VHOST_H
|
||||||
/* Userspace interface for in-kernel virtio accelerators. */
|
/* Userspace interface for in-kernel virtio accelerators. */
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,4 @@
|
||||||
|
/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
|
||||||
/*
|
/*
|
||||||
* Advanced Linux Sound Architecture - ALSA - Driver
|
* Advanced Linux Sound Architecture - ALSA - Driver
|
||||||
* Copyright (c) 1994-2003 by Jaroslav Kysela <perex@perex.cz>,
|
* Copyright (c) 1994-2003 by Jaroslav Kysela <perex@perex.cz>,
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user