With bed9ae54df44 ("x86/time: switch platform timer hooks to altcall")
in place we can further arrange for ENDBR removal from the functions no
longer subject to indirect calls. Note that plt_tsc is left untouched,
for not holding any pointer eligible for ENDBR removal.
Signed-off-by: Jan Beulich <jbeul...@suse.com>
---
I did consider converting most of the plt_* to const (plt_hpet and
plt_pmtimer cannot be converted), but this would entail quite a few
further changes.
--- a/xen/arch/x86/time.c
+++ b/xen/arch/x86/time.c
@@ -375,7 +375,7 @@ static void cf_check resume_pit(struct p
outb(0, PIT_CH2); /* MSB of count */
}
-static struct platform_timesource __initdata plt_pit =
+static struct platform_timesource __initdata_cf_clobber plt_pit =
{
.id = "pit",
.name = "PIT",
@@ -483,7 +483,7 @@ static void cf_check resume_hpet(struct
hpet_resume(NULL);
}
-static struct platform_timesource __initdata plt_hpet =
+static struct platform_timesource __initdata_cf_clobber plt_hpet =
{
.id = "hpet",
.name = "HPET",
@@ -528,7 +528,7 @@ static s64 __init cf_check init_pmtimer(
return adjust_elapsed(rdtsc_ordered() - start, elapsed, target);
}
-static struct platform_timesource __initdata plt_pmtimer =
+static struct platform_timesource __initdata_cf_clobber plt_pmtimer =
{
.id = "acpi",
.name = "ACPI PM Timer",
@@ -683,7 +683,7 @@ static void cf_check resume_xen_timer(st
write_atomic(&xen_timer_last, 0);
}
-static struct platform_timesource __initdata plt_xen_timer =
+static struct platform_timesource __initdata_cf_clobber plt_xen_timer =
{
.id = "xen",
.name = "XEN PV CLOCK",
@@ -780,7 +780,7 @@ static uint64_t cf_check read_hyperv_tim
return hv_scale_tsc(tsc, scale, offset);
}
-static struct platform_timesource __initdata plt_hyperv_timer =
+static struct platform_timesource __initdata_cf_clobber plt_hyperv_timer =
{
.id = "hyperv",
.name = "HYPER-V REFERENCE TSC",
