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

Unified · Split

26 files
  1. include/uapi/sound/asound.h +3 −3
  2. tools/arch/x86/include/asm/disabled-features.h +0 −1
  3. tools/arch/x86/include/asm/required-features.h +0 −1
  4. tools/arch/x86/include/uapi/asm/unistd.h +1 −0
  5. tools/arch/x86/lib/memcpy_64.S +4 −1
  6. tools/include/asm-generic/bitops/__fls.h +1 −0
  7. tools/include/asm-generic/bitops/arch_hweight.h +1 −0
  8. tools/include/asm-generic/bitops/const_hweight.h +1 −0
  9. tools/include/asm-generic/bitops/fls.h +1 −0
  10. tools/include/asm-generic/bitops/fls64.h +1 −0
  11. tools/include/asm/export.h +7 −0
  12. tools/include/linux/hash.h +0 −1
  13. tools/include/uapi/asm-generic/ioctls.h +1 −0
  14. tools/include/uapi/asm-generic/mman-common.h +1 −0
  15. tools/include/uapi/asm-generic/mman.h +2 −2
  16. tools/include/uapi/linux/bpf.h +2 −2
  17. tools/include/uapi/linux/bpf_common.h +1 −1
  18. tools/include/uapi/linux/fcntl.h +1 −1
  19. tools/include/uapi/linux/hw_breakpoint.h +1 −1
  20. tools/include/uapi/linux/kvm.h +1 −0
  21. tools/include/uapi/linux/mman.h +1 −1
  22. tools/include/uapi/linux/perf_event.h +1 −0
  23. tools/include/uapi/linux/sched.h +1 −0
  24. tools/include/uapi/linux/stat.h +1 −1
  25. tools/include/uapi/linux/vhost.h +1 −0
  26. tools/include/uapi/sound/asound.h +1 −0
include/uapi/sound/asound.h+3−3
@@ -94,7 +94,7 @@ enum { · 93 unmodified lines
9494 SNDRV_HWDEP_IFACE_VX, /* Digigram VX cards */
9595 SNDRV_HWDEP_IFACE_MIXART, /* Digigram miXart cards */
9696 SNDRV_HWDEP_IFACE_USX2Y, /* Tascam US122, US224 & US428 usb */
97− SNDRV_HWDEP_IFACE_EMUX_WAVETABLE, /* EmuX wavetable */
97+ SNDRV_HWDEP_IFACE_EMUX_WAVETABLE, /* EmuX wavetable */
9898 SNDRV_HWDEP_IFACE_BLUETOOTH, /* Bluetooth audio */
9999 SNDRV_HWDEP_IFACE_USX2Y_PCM, /* Tascam US122, US224 & US428 rawusb pcm */
100100 SNDRV_HWDEP_IFACE_PCXHR, /* Digigram PCXHR */
@@ -384,7 +384,7 @@ struct snd_mask { · 283 unmodified lines
384384
385385 struct snd_pcm_hw_params {
386386 unsigned int flags;
387− struct snd_mask masks[SNDRV_PCM_HW_PARAM_LAST_MASK -
387+ struct snd_mask masks[SNDRV_PCM_HW_PARAM_LAST_MASK -
388388 SNDRV_PCM_HW_PARAM_FIRST_MASK + 1];
389389 struct snd_mask mres[5]; /* reserved masks */
390390 struct snd_interval intervals[SNDRV_PCM_HW_PARAM_LAST_INTERVAL -
@@ -857,7 +857,7 @@ typedef int __bitwise snd_ctl_elem_iface_t; · 466 unmodified lines
857857 #define SNDRV_CTL_ELEM_ACCESS_INACTIVE (1<<8) /* control does actually nothing, but may be updated */
858858 #define SNDRV_CTL_ELEM_ACCESS_LOCK (1<<9) /* write lock */
859859 #define SNDRV_CTL_ELEM_ACCESS_OWNER (1<<10) /* write lock owner */
860−#define SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK (1<<28) /* kernel use a TLV callback */
860+#define SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK (1<<28) /* kernel use a TLV callback */
861861 #define SNDRV_CTL_ELEM_ACCESS_USER (1<<29) /* user space element */
862862 /* bits 30 and 31 are obsoleted (for indirect access) */
863863
tools/arch/x86/include/asm/disabled-features.h+0−1
@@ -1,4 +1,3 @@
1−/* SPDX-License-Identifier: GPL-2.0 */
21 #ifndef _ASM_X86_DISABLED_FEATURES_H
32 #define _ASM_X86_DISABLED_FEATURES_H
43
tools/arch/x86/include/asm/required-features.h+0−1
@@ -1,4 +1,3 @@
1−/* SPDX-License-Identifier: GPL-2.0 */
21 #ifndef _ASM_X86_REQUIRED_FEATURES_H
32 #define _ASM_X86_REQUIRED_FEATURES_H
43
tools/arch/x86/include/uapi/asm/unistd.h+1−0
@@ -1,3 +1,4 @@
1+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
12 #ifndef _UAPI_ASM_X86_UNISTD_H
23 #define _UAPI_ASM_X86_UNISTD_H
34
tools/arch/x86/lib/memcpy_64.S+4−1
@@ -1,10 +1,10 @@
1−/* SPDX-License-Identifier: GPL-2.0 */
21 /* Copyright 2002 Andi Kleen */
32
43 #include <linux/linkage.h>
54 #include <asm/errno.h>
65 #include <asm/cpufeatures.h>
76 #include <asm/alternative-asm.h>
7+#include <asm/export.h>
88
99 /*
1010 * We build a jump to memcpy_orig by default which gets NOPped out on
@@ -41,6 +41,8 @@ ENTRY(memcpy) · 30 unmodified lines
4141 ret
4242 ENDPROC(memcpy)
4343 ENDPROC(__memcpy)
44+EXPORT_SYMBOL(memcpy)
45+EXPORT_SYMBOL(__memcpy)
4446
4547 /*
4648 * memcpy_erms() - enhanced fast string memcpy. This is faster and
@@ -275,6 +277,7 @@ ENTRY(memcpy_mcsafe_unrolled) · 228 unmodified lines
275277 xorq %rax, %rax
276278 ret
277279 ENDPROC(memcpy_mcsafe_unrolled)
280+EXPORT_SYMBOL_GPL(memcpy_mcsafe_unrolled)
278281
279282 .section .fixup, "ax"
280283 /* Return -EFAULT for any failure */
tools/include/asm-generic/bitops/__fls.h+1−0
@@ -1,3 +1,4 @@
1+/* SPDX-License-Identifier: GPL-2.0 */
12 #ifndef _ASM_GENERIC_BITOPS___FLS_H_
23 #define _ASM_GENERIC_BITOPS___FLS_H_
34
tools/include/asm-generic/bitops/arch_hweight.h+1−0
@@ -1,3 +1,4 @@
1+/* SPDX-License-Identifier: GPL-2.0 */
12 #ifndef _ASM_GENERIC_BITOPS_ARCH_HWEIGHT_H_
23 #define _ASM_GENERIC_BITOPS_ARCH_HWEIGHT_H_
34
tools/include/asm-generic/bitops/const_hweight.h+1−0
@@ -1,3 +1,4 @@
1+/* SPDX-License-Identifier: GPL-2.0 */
12 #ifndef _ASM_GENERIC_BITOPS_CONST_HWEIGHT_H_
23 #define _ASM_GENERIC_BITOPS_CONST_HWEIGHT_H_
34
tools/include/asm-generic/bitops/fls.h+1−0
@@ -1,3 +1,4 @@
1+/* SPDX-License-Identifier: GPL-2.0 */
12 #ifndef _ASM_GENERIC_BITOPS_FLS_H_
23 #define _ASM_GENERIC_BITOPS_FLS_H_
34
tools/include/asm-generic/bitops/fls64.h+1−0
@@ -1,3 +1,4 @@
1+/* SPDX-License-Identifier: GPL-2.0 */
12 #ifndef _ASM_GENERIC_BITOPS_FLS64_H_
23 #define _ASM_GENERIC_BITOPS_FLS64_H_
34
tools/include/asm/export.h+7−0
@@ -0,0 +1,7 @@
1+#ifndef _TOOLS_ASM_EXPORT_H
2+#define _TOOLS_ASM_EXPORT_H
3+
4+#define EXPORT_SYMBOL(x)
5+#define EXPORT_SYMBOL_GPL(x)
6+
7+#endif /* _TOOLS_ASM_EXPORT_H */
tools/include/linux/hash.h+0−1
@@ -1,4 +1,3 @@
1−/* SPDX-License-Identifier: GPL-2.0 */
21 #ifndef _LINUX_HASH_H
32 #define _LINUX_HASH_H
43 /* Fast hashing routine for ints, longs and pointers.
tools/include/uapi/asm-generic/ioctls.h+1−0
@@ -1,3 +1,4 @@
1+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
12 #ifndef __ASM_GENERIC_IOCTLS_H
23 #define __ASM_GENERIC_IOCTLS_H
34
tools/include/uapi/asm-generic/mman-common.h+1−0
@@ -1,3 +1,4 @@
1+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
12 #ifndef __ASM_GENERIC_MMAN_COMMON_H
23 #define __ASM_GENERIC_MMAN_COMMON_H
34
tools/include/uapi/asm-generic/mman.h+2−2
@@ -1,8 +1,8 @@
1−/* SPDX-License-Identifier: GPL-2.0 */
1+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
22 #ifndef __ASM_GENERIC_MMAN_H
33 #define __ASM_GENERIC_MMAN_H
44
5−#include <uapi/asm-generic/mman-common.h>
5+#include <asm-generic/mman-common.h>
66
77 #define MAP_GROWSDOWN 0x0100 /* stack-like segment */
88 #define MAP_DENYWRITE 0x0800 /* ETXTBSY */
tools/include/uapi/linux/bpf.h+2−2
@@ -1,3 +1,4 @@
1+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
12 /* Copyright (c) 2011-2014 PLUMgrid, http://plumgrid.com
23 *
34 * This program is free software; you can redistribute it and/or
@@ -569,10 +570,9 @@ union bpf_attr { · 565 unmodified lines
569570 * @flags: reserved for future use
570571 * Return: 0 on success or negative error code
571572 *
572− * int bpf_sk_redirect_map(skb, map, key, flags)
573+ * int bpf_sk_redirect_map(map, key, flags)
573574 * Redirect skb to a sock in map using key as a lookup key for the
574575 * sock in map.
575− * @skb: pointer to skb
576576 * @map: pointer to sockmap
577577 * @key: key to lookup sock in map
578578 * @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 */
22 #ifndef _UAPI__LINUX_BPF_COMMON_H__
33 #define _UAPI__LINUX_BPF_COMMON_H__
44
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 */
22 #ifndef _UAPI_LINUX_FCNTL_H
33 #define _UAPI_LINUX_FCNTL_H
44
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 */
22 #ifndef _UAPI_LINUX_HW_BREAKPOINT_H
33 #define _UAPI_LINUX_HW_BREAKPOINT_H
44
tools/include/uapi/linux/kvm.h+1−0
@@ -1,3 +1,4 @@
1+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
12 #ifndef __LINUX_KVM_H
23 #define __LINUX_KVM_H
34
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 */
22 #ifndef _UAPI_LINUX_MMAN_H
33 #define _UAPI_LINUX_MMAN_H
44
tools/include/uapi/linux/perf_event.h+1−0
@@ -1,3 +1,4 @@
1+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
12 /*
23 * Performance events:
34 *
tools/include/uapi/linux/sched.h+1−0
@@ -1,3 +1,4 @@
1+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
12 #ifndef _UAPI_LINUX_SCHED_H
23 #define _UAPI_LINUX_SCHED_H
34
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 */
22 #ifndef _UAPI_LINUX_STAT_H
33 #define _UAPI_LINUX_STAT_H
44
tools/include/uapi/linux/vhost.h+1−0
@@ -1,3 +1,4 @@
1+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
12 #ifndef _LINUX_VHOST_H
23 #define _LINUX_VHOST_H
34 /* Userspace interface for in-kernel virtio accelerators. */
tools/include/uapi/sound/asound.h+1−0
@@ -1,3 +1,4 @@
1+/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */
12 /*
23 * Advanced Linux Sound Architecture - ALSA - Driver
34 * Copyright (c) 1994-2003 by Jaroslav Kysela <perex@perex.cz>,