summaryrefslogtreecommitdiffstats
path: root/arch/arm/kernel/paravirt.c
diff options
context:
space:
mode:
authorBorislav Petkov <bp@suse.de>2021-03-31 18:04:19 +0200
committerBorislav Petkov <bp@suse.de>2021-03-31 18:04:19 +0200
commitf2ac256b9a8b7e79847efcd82bd10fd876369b9f (patch)
tree8769fa5130754ecc605df8803650293f88357879 /arch/arm/kernel/paravirt.c
parentx86: Add insn_decode_kernel() (diff)
parentx86/paravirt: Have only one paravirt patch function (diff)
downloadlinux-f2ac256b9a8b7e79847efcd82bd10fd876369b9f.tar.xz
linux-f2ac256b9a8b7e79847efcd82bd10fd876369b9f.zip
Merge 'x86/alternatives'
Pick up dependent changes. Signed-off-by: Borislav Petkov <bp@suse.de>
Diffstat (limited to 'arch/arm/kernel/paravirt.c')
-rw-r--r--arch/arm/kernel/paravirt.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/arm/kernel/paravirt.c b/arch/arm/kernel/paravirt.c
index 4cfed91fe256..7dd9806369fb 100644
--- a/arch/arm/kernel/paravirt.c
+++ b/arch/arm/kernel/paravirt.c
@@ -9,10 +9,15 @@
#include <linux/export.h>
#include <linux/jump_label.h>
#include <linux/types.h>
+#include <linux/static_call.h>
#include <asm/paravirt.h>
struct static_key paravirt_steal_enabled;
struct static_key paravirt_steal_rq_enabled;
-struct paravirt_patch_template pv_ops;
-EXPORT_SYMBOL_GPL(pv_ops);
+static u64 native_steal_clock(int cpu)
+{
+ return 0;
+}
+
+DEFINE_STATIC_CALL(pv_steal_clock, native_steal_clock);