diff options
| author | Borislav Petkov <bp@suse.de> | 2021-03-31 18:04:19 +0200 |
|---|---|---|
| committer | Borislav Petkov <bp@suse.de> | 2021-03-31 18:04:19 +0200 |
| commit | f2ac256b9a8b7e79847efcd82bd10fd876369b9f (patch) | |
| tree | 8769fa5130754ecc605df8803650293f88357879 /drivers | |
| parent | 52fa82c21f64e900a72437269a5cc9e0034b424e (diff) | |
| parent | 054ac8ad5ebe4a69e1f0e842483821ddbe560121 (diff) | |
Merge 'x86/alternatives'
Pick up dependent changes.
Signed-off-by: Borislav Petkov <bp@suse.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/xen/time.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/xen/time.c b/drivers/xen/time.c index 108edbcbc040..152dd33bb223 100644 --- a/drivers/xen/time.c +++ b/drivers/xen/time.c @@ -7,6 +7,7 @@ #include <linux/math64.h> #include <linux/gfp.h> #include <linux/slab.h> +#include <linux/static_call.h> #include <asm/paravirt.h> #include <asm/xen/hypervisor.h> @@ -175,7 +176,7 @@ void __init xen_time_setup_guest(void) xen_runstate_remote = !HYPERVISOR_vm_assist(VMASST_CMD_enable, VMASST_TYPE_runstate_update_flag); - pv_ops.time.steal_clock = xen_steal_clock; + static_call_update(pv_steal_clock, xen_steal_clock); static_key_slow_inc(¶virt_steal_enabled); if (xen_runstate_remote) |