+3 -3

include/uapi/sound/asound.h

reviewed

··· 94 94 SNDRV_HWDEP_IFACE_VX, /* Digigram VX cards */ 95 95 SNDRV_HWDEP_IFACE_MIXART, /* Digigram miXart cards */ 96 96 SNDRV_HWDEP_IFACE_USX2Y, /* Tascam US122, US224 & US428 usb */ 97 97 - SNDRV_HWDEP_IFACE_EMUX_WAVETABLE, /* EmuX wavetable */ 97 97 + SNDRV_HWDEP_IFACE_EMUX_WAVETABLE, /* EmuX wavetable */ 98 98 SNDRV_HWDEP_IFACE_BLUETOOTH, /* Bluetooth audio */ 99 99 SNDRV_HWDEP_IFACE_USX2Y_PCM, /* Tascam US122, US224 & US428 rawusb pcm */ 100 100 SNDRV_HWDEP_IFACE_PCXHR, /* Digigram PCXHR */ ··· 384 384 385 385 struct snd_pcm_hw_params { 386 386 unsigned int flags; 387 387 - struct snd_mask masks[SNDRV_PCM_HW_PARAM_LAST_MASK - 387 387 + struct snd_mask masks[SNDRV_PCM_HW_PARAM_LAST_MASK - 388 388 SNDRV_PCM_HW_PARAM_FIRST_MASK + 1]; 389 389 struct snd_mask mres[5]; /* reserved masks */ 390 390 struct snd_interval intervals[SNDRV_PCM_HW_PARAM_LAST_INTERVAL - ··· 857 857 #define SNDRV_CTL_ELEM_ACCESS_INACTIVE (1<<8) /* control does actually nothing, but may be updated */ 858 858 #define SNDRV_CTL_ELEM_ACCESS_LOCK (1<<9) /* write lock */ 859 859 #define SNDRV_CTL_ELEM_ACCESS_OWNER (1<<10) /* write lock owner */ 860 860 - #define SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK (1<<28) /* kernel use a TLV callback */ 860 860 + #define SNDRV_CTL_ELEM_ACCESS_TLV_CALLBACK (1<<28) /* kernel use a TLV callback */ 861 861 #define SNDRV_CTL_ELEM_ACCESS_USER (1<<29) /* user space element */ 862 862 /* bits 30 and 31 are obsoleted (for indirect access) */ 863 863

+4 -2

kernel/events/core.c

reviewed

··· 901 901 cpuctx_entry = &cpuctx->cgrp_cpuctx_entry; 902 902 /* cpuctx->cgrp is NULL unless a cgroup event is active in this CPU .*/ 903 903 if (add) { 904 904 + struct perf_cgroup *cgrp = perf_cgroup_from_task(current, ctx); 905 905 + 904 906 list_add(cpuctx_entry, this_cpu_ptr(&cgrp_cpuctx_list)); 905 905 - if (perf_cgroup_from_task(current, ctx) == event->cgrp) 906 906 - cpuctx->cgrp = event->cgrp; 907 907 + if (cgroup_is_descendant(cgrp->css.cgroup, event->cgrp->css.cgroup)) 908 908 + cpuctx->cgrp = cgrp; 907 909 } else { 908 910 list_del(cpuctx_entry); 909 911 cpuctx->cgrp = NULL;

-1

tools/arch/x86/include/asm/disabled-features.h

reviewed

··· 1 1 - /* SPDX-License-Identifier: GPL-2.0 */ 2 1 #ifndef _ASM_X86_DISABLED_FEATURES_H 3 2 #define _ASM_X86_DISABLED_FEATURES_H 4 3

-1

tools/arch/x86/include/asm/required-features.h

reviewed

··· 1 1 - /* SPDX-License-Identifier: GPL-2.0 */ 2 1 #ifndef _ASM_X86_REQUIRED_FEATURES_H 3 2 #define _ASM_X86_REQUIRED_FEATURES_H 4 3

+1

tools/arch/x86/include/uapi/asm/unistd.h

reviewed

··· 1 1 + /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ 1 2 #ifndef _UAPI_ASM_X86_UNISTD_H 2 3 #define _UAPI_ASM_X86_UNISTD_H 3 4

+4 -1

tools/arch/x86/lib/memcpy_64.S

reviewed

··· 1 1 - /* SPDX-License-Identifier: GPL-2.0 */ 2 1 /* Copyright 2002 Andi Kleen */ 3 2 4 3 #include <linux/linkage.h> 5 4 #include <asm/errno.h> 6 5 #include <asm/cpufeatures.h> 7 6 #include <asm/alternative-asm.h> 7 7 + #include <asm/export.h> 8 8 9 9 /* 10 10 * We build a jump to memcpy_orig by default which gets NOPped out on ··· 41 41 ret 42 42 ENDPROC(memcpy) 43 43 ENDPROC(__memcpy) 44 44 + EXPORT_SYMBOL(memcpy) 45 45 + EXPORT_SYMBOL(__memcpy) 44 46 45 47 /* 46 48 * memcpy_erms() - enhanced fast string memcpy. This is faster and ··· 277 275 xorq %rax, %rax 278 276 ret 279 277 ENDPROC(memcpy_mcsafe_unrolled) 278 278 + EXPORT_SYMBOL_GPL(memcpy_mcsafe_unrolled) 280 279 281 280 .section .fixup, "ax" 282 281 /* Return -EFAULT for any failure */

+1

tools/include/asm-generic/bitops/__fls.h

reviewed

··· 1 1 + /* SPDX-License-Identifier: GPL-2.0 */ 1 2 #ifndef _ASM_GENERIC_BITOPS___FLS_H_ 2 3 #define _ASM_GENERIC_BITOPS___FLS_H_ 3 4

+1

tools/include/asm-generic/bitops/arch_hweight.h

reviewed

··· 1 1 + /* SPDX-License-Identifier: GPL-2.0 */ 1 2 #ifndef _ASM_GENERIC_BITOPS_ARCH_HWEIGHT_H_ 2 3 #define _ASM_GENERIC_BITOPS_ARCH_HWEIGHT_H_ 3 4

+1

tools/include/asm-generic/bitops/const_hweight.h

reviewed

··· 1 1 + /* SPDX-License-Identifier: GPL-2.0 */ 1 2 #ifndef _ASM_GENERIC_BITOPS_CONST_HWEIGHT_H_ 2 3 #define _ASM_GENERIC_BITOPS_CONST_HWEIGHT_H_ 3 4

+1

tools/include/asm-generic/bitops/fls.h

reviewed

··· 1 1 + /* SPDX-License-Identifier: GPL-2.0 */ 1 2 #ifndef _ASM_GENERIC_BITOPS_FLS_H_ 2 3 #define _ASM_GENERIC_BITOPS_FLS_H_ 3 4

+1

tools/include/asm-generic/bitops/fls64.h

reviewed

··· 1 1 + /* SPDX-License-Identifier: GPL-2.0 */ 1 2 #ifndef _ASM_GENERIC_BITOPS_FLS64_H_ 2 3 #define _ASM_GENERIC_BITOPS_FLS64_H_ 3 4

+7

tools/include/asm/export.h

reviewed

··· 1 1 + #ifndef _TOOLS_ASM_EXPORT_H 2 2 + #define _TOOLS_ASM_EXPORT_H 3 3 + 4 4 + #define EXPORT_SYMBOL(x) 5 5 + #define EXPORT_SYMBOL_GPL(x) 6 6 + 7 7 + #endif /* _TOOLS_ASM_EXPORT_H */

-1

tools/include/linux/hash.h

reviewed

··· 1 1 - /* SPDX-License-Identifier: GPL-2.0 */ 2 1 #ifndef _LINUX_HASH_H 3 2 #define _LINUX_HASH_H 4 3 /* Fast hashing routine for ints, longs and pointers.

+1

tools/include/uapi/asm-generic/ioctls.h

reviewed

··· 1 1 + /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ 1 2 #ifndef __ASM_GENERIC_IOCTLS_H 2 3 #define __ASM_GENERIC_IOCTLS_H 3 4

+1

tools/include/uapi/asm-generic/mman-common.h

reviewed

··· 1 1 + /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ 1 2 #ifndef __ASM_GENERIC_MMAN_COMMON_H 2 3 #define __ASM_GENERIC_MMAN_COMMON_H 3 4

+2 -2

tools/include/uapi/asm-generic/mman.h

reviewed

··· 1 1 - /* SPDX-License-Identifier: GPL-2.0 */ 1 1 + /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ 2 2 #ifndef __ASM_GENERIC_MMAN_H 3 3 #define __ASM_GENERIC_MMAN_H 4 4 5 5 - #include <uapi/asm-generic/mman-common.h> 5 5 + #include <asm-generic/mman-common.h> 6 6 7 7 #define MAP_GROWSDOWN 0x0100 /* stack-like segment */ 8 8 #define MAP_DENYWRITE 0x0800 /* ETXTBSY */

+2 -2

tools/include/uapi/linux/bpf.h

reviewed

··· 1 1 + /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ 1 2 /* Copyright (c) 2011-2014 PLUMgrid, http://plumgrid.com 2 3 * 3 4 * This program is free software; you can redistribute it and/or ··· 570 569 * @flags: reserved for future use 571 570 * Return: 0 on success or negative error code 572 571 * 573 573 - * int bpf_sk_redirect_map(skb, map, key, flags) 572 572 + * int bpf_sk_redirect_map(map, key, flags) 574 573 * Redirect skb to a sock in map using key as a lookup key for the 575 574 * sock in map. 576 576 - * @skb: pointer to skb 577 575 * @map: pointer to sockmap 578 576 * @key: key to lookup sock in map 579 577 * @flags: reserved for future use

+1 -1

tools/include/uapi/linux/bpf_common.h

reviewed

··· 1 1 - /* SPDX-License-Identifier: GPL-2.0 */ 1 1 + /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ 2 2 #ifndef _UAPI__LINUX_BPF_COMMON_H__ 3 3 #define _UAPI__LINUX_BPF_COMMON_H__ 4 4

+1 -1

tools/include/uapi/linux/fcntl.h

reviewed

··· 1 1 - /* SPDX-License-Identifier: GPL-2.0 */ 1 1 + /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ 2 2 #ifndef _UAPI_LINUX_FCNTL_H 3 3 #define _UAPI_LINUX_FCNTL_H 4 4

+1 -1

tools/include/uapi/linux/hw_breakpoint.h

reviewed

··· 1 1 - /* SPDX-License-Identifier: GPL-2.0 */ 1 1 + /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ 2 2 #ifndef _UAPI_LINUX_HW_BREAKPOINT_H 3 3 #define _UAPI_LINUX_HW_BREAKPOINT_H 4 4

+1

tools/include/uapi/linux/kvm.h

reviewed

··· 1 1 + /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ 1 2 #ifndef __LINUX_KVM_H 2 3 #define __LINUX_KVM_H 3 4

+1 -1

tools/include/uapi/linux/mman.h

reviewed

··· 1 1 - /* SPDX-License-Identifier: GPL-2.0 */ 1 1 + /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ 2 2 #ifndef _UAPI_LINUX_MMAN_H 3 3 #define _UAPI_LINUX_MMAN_H 4 4

+1

tools/include/uapi/linux/perf_event.h

reviewed

··· 1 1 + /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ 1 2 /* 2 3 * Performance events: 3 4 *

+1

tools/include/uapi/linux/sched.h

reviewed

··· 1 1 + /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ 1 2 #ifndef _UAPI_LINUX_SCHED_H 2 3 #define _UAPI_LINUX_SCHED_H 3 4

+1 -1

tools/include/uapi/linux/stat.h

reviewed

··· 1 1 - /* SPDX-License-Identifier: GPL-2.0 */ 1 1 + /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ 2 2 #ifndef _UAPI_LINUX_STAT_H 3 3 #define _UAPI_LINUX_STAT_H 4 4

+1

tools/include/uapi/linux/vhost.h

reviewed

··· 1 1 + /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ 1 2 #ifndef _LINUX_VHOST_H 2 3 #define _LINUX_VHOST_H 3 4 /* Userspace interface for in-kernel virtio accelerators. */

+1

tools/include/uapi/sound/asound.h

reviewed

··· 1 1 + /* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */ 1 2 /* 2 3 * Advanced Linux Sound Architecture - ALSA - Driver 3 4 * Copyright (c) 1994-2003 by Jaroslav Kysela <perex@perex.cz>,

+11 -1

tools/perf/util/annotate.c

reviewed

··· 606 606 int symbol__alloc_hist(struct symbol *sym) 607 607 { 608 608 struct annotation *notes = symbol__annotation(sym); 609 609 - const size_t size = symbol__size(sym); 609 609 + size_t size = symbol__size(sym); 610 610 size_t sizeof_sym_hist; 611 611 + 612 612 + /* 613 613 + * Add buffer of one element for zero length symbol. 614 614 + * When sample is taken from first instruction of 615 615 + * zero length symbol, perf still resolves it and 616 616 + * shows symbol name in perf report and allows to 617 617 + * annotate it. 618 618 + */ 619 619 + if (size == 0) 620 620 + size = 1; 611 621 612 622 /* Check for overflow when calculating sizeof_sym_hist */ 613 623 if (size > (SIZE_MAX - sizeof(struct sym_hist)) / sizeof(struct sym_hist_entry))

+6 -2

tools/perf/util/parse-events.l

reviewed

··· 154 154 yycolumn += yyleng; \ 155 155 } while (0); 156 156 157 157 + #define USER_REJECT \ 158 158 + yycolumn -= yyleng; \ 159 159 + REJECT 160 160 + 157 161 %} 158 162 159 163 %x mem ··· 339 335 {num_hex} { return value(yyscanner, 16); } 340 336 341 337 {modifier_event} { return str(yyscanner, PE_MODIFIER_EVENT); } 342 342 - {bpf_object} { if (!isbpf(yyscanner)) REJECT; return str(yyscanner, PE_BPF_OBJECT); } 343 343 - {bpf_source} { if (!isbpf(yyscanner)) REJECT; return str(yyscanner, PE_BPF_SOURCE); } 338 338 + {bpf_object} { if (!isbpf(yyscanner)) USER_REJECT; return str(yyscanner, PE_BPF_OBJECT); } 339 339 + {bpf_source} { if (!isbpf(yyscanner)) USER_REJECT; return str(yyscanner, PE_BPF_SOURCE); } 344 340 {name} { return pmu_str_check(yyscanner); } 345 341 "/" { BEGIN(config); return '/'; } 346 342 - { return '-'; }