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 include/uapi (1 of 26 files). Show all
Unified · Split
| @@ -94,7 +94,7 @@ enum { · 93 unmodified lines | |||
| 94 | SNDRV_HWDEP_IFACE_VX, /* Digigram VX cards */ | 94 | SNDRV_HWDEP_IFACE_VX, /* Digigram VX cards */ |
| 95 | SNDRV_HWDEP_IFACE_MIXART, /* Digigram miXart cards */ | 95 | SNDRV_HWDEP_IFACE_MIXART, /* Digigram miXart cards */ |
| 96 | SNDRV_HWDEP_IFACE_USX2Y, /* Tascam US122, US224 & US428 usb */ | 96 | 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 */ |
| 98 | SNDRV_HWDEP_IFACE_BLUETOOTH, /* Bluetooth audio */ | 98 | SNDRV_HWDEP_IFACE_BLUETOOTH, /* Bluetooth audio */ |
| 99 | SNDRV_HWDEP_IFACE_USX2Y_PCM, /* Tascam US122, US224 & US428 rawusb pcm */ | 99 | SNDRV_HWDEP_IFACE_USX2Y_PCM, /* Tascam US122, US224 & US428 rawusb pcm */ |
| 100 | SNDRV_HWDEP_IFACE_PCXHR, /* Digigram PCXHR */ | 100 | SNDRV_HWDEP_IFACE_PCXHR, /* Digigram PCXHR */ |
| @@ -384,7 +384,7 @@ struct snd_mask { · 283 unmodified lines | |||
| 384 | 384 | ||
| 385 | struct snd_pcm_hw_params { | 385 | struct snd_pcm_hw_params { |
| 386 | unsigned int flags; | 386 | 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 - |
| 388 | SNDRV_PCM_HW_PARAM_FIRST_MASK + 1]; | 388 | SNDRV_PCM_HW_PARAM_FIRST_MASK + 1]; |
| 389 | struct snd_mask mres[5]; /* reserved masks */ | 389 | struct snd_mask mres[5]; /* reserved masks */ |
| 390 | struct snd_interval intervals[SNDRV_PCM_HW_PARAM_LAST_INTERVAL - | 390 | 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 | |||
| 857 | #define SNDRV_CTL_ELEM_ACCESS_INACTIVE (1<<8) /* control does actually nothing, but may be updated */ | 857 | #define SNDRV_CTL_ELEM_ACCESS_INACTIVE (1<<8) /* control does actually nothing, but may be updated */ |
| 858 | #define SNDRV_CTL_ELEM_ACCESS_LOCK (1<<9) /* write lock */ | 858 | #define SNDRV_CTL_ELEM_ACCESS_LOCK (1<<9) /* write lock */ |
| 859 | #define SNDRV_CTL_ELEM_ACCESS_OWNER (1<<10) /* write lock owner */ | 859 | #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 */ |
| 861 | #define SNDRV_CTL_ELEM_ACCESS_USER (1<<29) /* user space element */ | 861 | #define SNDRV_CTL_ELEM_ACCESS_USER (1<<29) /* user space element */ |
| 862 | /* bits 30 and 31 are obsoleted (for indirect access) */ | 862 | /* bits 30 and 31 are obsoleted (for indirect access) */ |
| 863 | 863 | ||