History

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.

Ingo Molnar committed 9 years ago

Commit fb7df121 parent 294cbd026 files · +36 −16Browse files

Showing the changes to tools/include/uapi/linux (10 of 26 files). Show all

Unified · Split

10 files
  1. tools/include/uapi/linux/bpf.h +2 −2
  2. tools/include/uapi/linux/bpf_common.h +1 −1
  3. tools/include/uapi/linux/fcntl.h +1 −1
  4. tools/include/uapi/linux/hw_breakpoint.h +1 −1
  5. tools/include/uapi/linux/kvm.h +1 −0
  6. tools/include/uapi/linux/mman.h +1 −1
  7. tools/include/uapi/linux/perf_event.h +1 −0
  8. tools/include/uapi/linux/sched.h +1 −0
  9. tools/include/uapi/linux/stat.h +1 −1
  10. tools/include/uapi/linux/vhost.h +1 −0
tools/include/uapi/linux/bpf.h+2−2
@@ -1,3 +1,4 @@
1/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
1/* Copyright (c) 2011-2014 PLUMgrid, http://plumgrid.com2/* Copyright (c) 2011-2014 PLUMgrid, http://plumgrid.com
2 *3 *
3 * This program is free software; you can redistribute it and/or4 * This program is free software; you can redistribute it and/or
@@ -569,10 +570,9 @@ union bpf_attr { · 565 unmodified lines
569 * @flags: reserved for future use570 * @flags: reserved for future use
570 * Return: 0 on success or negative error code571 * 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 * Redirect skb to a sock in map using key as a lookup key for the574 * Redirect skb to a sock in map using key as a lookup key for the
574 * sock in map.575 * sock in map.
575 * @skb: pointer to skb
576 * @map: pointer to sockmap576 * @map: pointer to sockmap
577 * @key: key to lookup sock in map577 * @key: key to lookup sock in map
578 * @flags: reserved for future use578 * @flags: reserved for future use
tools/include/uapi/linux/bpf_common.h+1−1
@@ -1,4 +1,4 @@
1/* SPDX-License-Identifier: GPL-2.0 */1/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
2#ifndef _UAPI__LINUX_BPF_COMMON_H__2#ifndef _UAPI__LINUX_BPF_COMMON_H__
3#define _UAPI__LINUX_BPF_COMMON_H__3#define _UAPI__LINUX_BPF_COMMON_H__
4 4
tools/include/uapi/linux/fcntl.h+1−1
@@ -1,4 +1,4 @@
1/* SPDX-License-Identifier: GPL-2.0 */1/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
2#ifndef _UAPI_LINUX_FCNTL_H2#ifndef _UAPI_LINUX_FCNTL_H
3#define _UAPI_LINUX_FCNTL_H3#define _UAPI_LINUX_FCNTL_H
4 4
tools/include/uapi/linux/hw_breakpoint.h+1−1
@@ -1,4 +1,4 @@
1/* SPDX-License-Identifier: GPL-2.0 */1/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
2#ifndef _UAPI_LINUX_HW_BREAKPOINT_H2#ifndef _UAPI_LINUX_HW_BREAKPOINT_H
3#define _UAPI_LINUX_HW_BREAKPOINT_H3#define _UAPI_LINUX_HW_BREAKPOINT_H
4 4
tools/include/uapi/linux/kvm.h+1−0
@@ -1,3 +1,4 @@
1/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
1#ifndef __LINUX_KVM_H2#ifndef __LINUX_KVM_H
2#define __LINUX_KVM_H3#define __LINUX_KVM_H
3 4
tools/include/uapi/linux/mman.h+1−1
@@ -1,4 +1,4 @@
1/* SPDX-License-Identifier: GPL-2.0 */1/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
2#ifndef _UAPI_LINUX_MMAN_H2#ifndef _UAPI_LINUX_MMAN_H
3#define _UAPI_LINUX_MMAN_H3#define _UAPI_LINUX_MMAN_H
4 4
tools/include/uapi/linux/perf_event.h+1−0
@@ -1,3 +1,4 @@
1/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
1/*2/*
2 * Performance events:3 * Performance events:
3 *4 *
tools/include/uapi/linux/sched.h+1−0
@@ -1,3 +1,4 @@
1/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
1#ifndef _UAPI_LINUX_SCHED_H2#ifndef _UAPI_LINUX_SCHED_H
2#define _UAPI_LINUX_SCHED_H3#define _UAPI_LINUX_SCHED_H
3 4
tools/include/uapi/linux/stat.h+1−1
@@ -1,4 +1,4 @@
1/* SPDX-License-Identifier: GPL-2.0 */1/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
2#ifndef _UAPI_LINUX_STAT_H2#ifndef _UAPI_LINUX_STAT_H
3#define _UAPI_LINUX_STAT_H3#define _UAPI_LINUX_STAT_H
4 4
tools/include/uapi/linux/vhost.h+1−0
@@ -1,3 +1,4 @@
1/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
1#ifndef _LINUX_VHOST_H2#ifndef _LINUX_VHOST_H
2#define _LINUX_VHOST_H3#define _LINUX_VHOST_H
3/* Userspace interface for in-kernel virtio accelerators. */4/* Userspace interface for in-kernel virtio accelerators. */