diff options
| author | Anton Ivanov <anton.ivanov@cambridgegreys.com> | 2021-03-12 15:16:08 +0000 |
|---|---|---|
| committer | Richard Weinberger <richard@nod.at> | 2021-06-17 22:01:26 +0200 |
| commit | c0ecca6604b80e438b032578634c6e133c7028f6 (patch) | |
| tree | 624434bb4fa041a266453ccd6a6cef529c99a865 /arch | |
| parent | d8fb32f4790f2a286e58db8548016378ac35fc6f (diff) | |
| download | linux-c0ecca6604b80e438b032578634c6e133c7028f6.tar.gz linux-c0ecca6604b80e438b032578634c6e133c7028f6.tar.bz2 linux-c0ecca6604b80e438b032578634c6e133c7028f6.zip | |
um: enable the use of optimized xor routines in UML
This patch enables the use of optimized xor routines from the x86
tree as well as the necessary fpu api shims so they can work on
UML.
Signed-off-by: Anton Ivanov <anton.ivanov@cambridgegreys.com>
Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/um/include/asm/fpu/api.h | 20 | ||||
| -rw-r--r-- | arch/um/include/asm/xor.h | 17 |
2 files changed, 36 insertions, 1 deletions
diff --git a/arch/um/include/asm/fpu/api.h b/arch/um/include/asm/fpu/api.h new file mode 100644 index 000000000000..71bfd9ef3938 --- /dev/null +++ b/arch/um/include/asm/fpu/api.h @@ -0,0 +1,20 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +#ifndef _ASM_UM_FPU_API_H +#define _ASM_UM_FPU_API_H + +/* Copyright (c) 2020 Cambridge Greys Ltd + * Copyright (c) 2020 Red Hat Inc. + * A set of "dummy" defines to allow the direct inclusion + * of x86 optimized copy, xor, etc routines into the + * UML code tree. */ + +#define kernel_fpu_begin() (void)0 +#define kernel_fpu_end() (void)0 + +static inline bool irq_fpu_usable(void) +{ + return true; +} + + +#endif diff --git a/arch/um/include/asm/xor.h b/arch/um/include/asm/xor.h index 36b33d62a35d..f512704a9ec7 100644 --- a/arch/um/include/asm/xor.h +++ b/arch/um/include/asm/xor.h @@ -1,7 +1,22 @@ /* SPDX-License-Identifier: GPL-2.0 */ -#include <asm-generic/xor.h> +#ifndef _ASM_UM_XOR_H +#define _ASM_UM_XOR_H + +#ifdef CONFIG_64BIT +#undef CONFIG_X86_32 +#else +#define CONFIG_X86_32 1 +#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 ? &xor_block_8regs : NULL) +#endif + +#endif |