]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commit
um: fix and optimize xor select template for CONFIG64 and timetravel mode
authorBenjamin Beichler <benjamin.beichler@uni-rostock.de>
Tue, 11 Jan 2022 20:05:06 +0000 (20:05 +0000)
committerStefan Bader <stefan.bader@canonical.com>
Fri, 20 May 2022 12:40:28 +0000 (14:40 +0200)
commit2a23eb8f2ec4cd5a70774bbae16d35382135c5fa
treed041e94769d1169c563fe2b2fcc7f33e0e72199e
parent57439ac527e55c26c4f08c4a533309ed39d1c2e2
um: fix and optimize xor select template for CONFIG64 and timetravel mode

BugLink: https://bugs.launchpad.net/bugs/1969107
[ Upstream commit e3a33af812c611d99756e2ec61e9d7068d466bdf ]

Due to dropped inclusion of asm-generic/xor.h, xor_block_8regs symbol is
missing with CONFIG64 and break compilation, as the asm/xor_64.h also did
not include it. The patch recreate the logic from arch/x86, which check
whether AVX is available and add fallbacks for 32bit and 64bit config of
um.

A very minor additional "fix" is, the return of the macro parameter
instead of NULL, as this is the original intent of the macro, but
this does not change the actual behavior.

Fixes: c0ecca6604b8 ("um: enable the use of optimized xor routines in UML")
Signed-off-by: Benjamin Beichler <benjamin.beichler@uni-rostock.de>
Acked-By: Anton Ivanov <anton.ivanov@cambridgegreys.com>
Signed-off-by: Richard Weinberger <richard@nod.at>
Signed-off-by: Sasha Levin <sashal@kernel.org>
(cherry picked from commit b257272f5483eaa0b2e5139d3ac2299e2cfd6100)
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
arch/um/include/asm/xor.h