diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-01-10 10:02:27 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-01-10 10:02:27 -0800 |
commit | 308319e990ae95b2a752fa0a1730f88598ca0dc7 (patch) | |
tree | 6c89080f96892e66637e7b405e863e282e78be57 /arch/x86/events | |
parent | 2e97a0c02b94f2ecd5cbf29ded90c5db055e8ad0 (diff) | |
parent | 0be4838f018c10d7f138a213c006d345db35ef5b (diff) | |
download | linux-308319e990ae95b2a752fa0a1730f88598ca0dc7.tar.bz2 |
Merge tag 'x86_cleanups_for_v5.17_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 cleanups from Borislav Petkov:
"The mandatory set of random minor cleanups all over tip"
* tag 'x86_cleanups_for_v5.17_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/events/amd/iommu: Remove redundant assignment to variable shift
x86/boot/string: Add missing function prototypes
x86/fpu: Remove duplicate copy_fpstate_to_sigframe() prototype
x86/uaccess: Move variable into switch case statement
Diffstat (limited to 'arch/x86/events')
-rw-r--r-- | arch/x86/events/amd/iommu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/events/amd/iommu.c b/arch/x86/events/amd/iommu.c index 913745f1419b..b15f7b950d2e 100644 --- a/arch/x86/events/amd/iommu.c +++ b/arch/x86/events/amd/iommu.c @@ -161,7 +161,7 @@ static int get_next_avail_iommu_bnk_cntr(struct perf_event *event) raw_spin_lock_irqsave(&piommu->lock, flags); - for (bank = 0, shift = 0; bank < max_banks; bank++) { + for (bank = 0; bank < max_banks; bank++) { for (cntr = 0; cntr < max_cntrs; cntr++) { shift = bank + (bank*3) + cntr; if (piommu->cntr_assign_mask & BIT_ULL(shift)) { |