Skip to content

Commit fb7df12

Browse files
ingomolnaringomolnar
committed
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>
1 parent 294cbd0 commit fb7df12

26 files changed

Lines changed: 36 additions & 16 deletions

File tree

‎include/uapi/sound/asound.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ enum {
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 {
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;
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‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -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‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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)
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)
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‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -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‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -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‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -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‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -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‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -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

0 commit comments

Comments
 (0)