5d096e2dc2
commit c6496e0a4a90d8149203c16323cff3fa46e422e7 upstream.
Commit e3a33af812c6 ("um: fix and optimize xor select template for CONFIG64 and timetravel mode")
caused a build regression when CONFIG_XOR_BLOCKS and CONFIG_UML_TIME_TRAVEL_SUPPORT
are selected.
Fix it by removing the straying parenthesis.
Cc: stable@vger.kernel.org
Fixes: e3a33af812c6 ("um: fix and optimize xor select template for CONFIG64 and timetravel mode")
Signed-off-by: Benjamin Beichler <benjamin.beichler@uni-rostock.de>
[rw: Added commit message]
Signed-off-by: Richard Weinberger <richard@nod.at>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
25 lines
639 B
C
25 lines
639 B
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#ifndef _ASM_UM_XOR_H
|
|
#define _ASM_UM_XOR_H
|
|
|
|
#ifdef CONFIG_64BIT
|
|
#undef CONFIG_X86_32
|
|
#define TT_CPU_INF_XOR_DEFAULT (AVX_SELECT(&xor_block_sse_pf64))
|
|
#else
|
|
#define CONFIG_X86_32 1
|
|
#define TT_CPU_INF_XOR_DEFAULT (AVX_SELECT(&xor_block_8regs))
|
|
#endif
|
|
|
|
#include <asm/cpufeature.h>
|
|
#include <../../x86/include/asm/xor.h>
|
|
#include <linux/time-internal.h>
|
|
|
|
#ifdef CONFIG_UML_TIME_TRAVEL_SUPPORT
|
|
#undef XOR_SELECT_TEMPLATE
|
|
/* pick an arbitrary one - measuring isn't possible with inf-cpu */
|
|
#define XOR_SELECT_TEMPLATE(x) \
|
|
(time_travel_mode == TT_MODE_INFCPU ? TT_CPU_INF_XOR_DEFAULT : x)
|
|
#endif
|
|
|
|
#endif
|