From: Greg Kroah-Hartman Date: Fri, 3 Feb 2023 10:07:53 +0000 (+0100) Subject: Revert "fix up queue-4.14/xen-fix-up-build-warning-with-xen_init_time_ops-reference... X-Git-Tag: v4.14.305~5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=88dad9568b046b04231eabce4cbbe4a231b1b319;p=thirdparty%2Fkernel%2Fstable-queue.git Revert "fix up queue-4.14/xen-fix-up-build-warning-with-xen_init_time_ops-reference.patch" This reverts commit 45c2738b177f6813cb63821396b8ee71decb0b13. Let's go back to the previous version... --- diff --git a/queue-4.14/xen-fix-up-build-warning-with-xen_init_time_ops-reference.patch b/queue-4.14/xen-fix-up-build-warning-with-xen_init_time_ops-reference.patch index 36fed0bbb28..53bd685313a 100644 --- a/queue-4.14/xen-fix-up-build-warning-with-xen_init_time_ops-reference.patch +++ b/queue-4.14/xen-fix-up-build-warning-with-xen_init_time_ops-reference.patch @@ -7,15 +7,15 @@ From: Greg Kroah-Hartman Somehow the xen_init_time_ops() reference got out of sync in the 4.14.y tree (or it never was in sync), and now there's a build warning. Fix -that up by removing the __ref and __init marking for xen_init_time_ops() -to resolve all build warnings. +that up by making xen_init_time_ops() be __init, not __ref. Signed-off-by: Greg Kroah-Hartman --- - arch/x86/xen/time.c | 2 +- - arch/x86/xen/xen-ops.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) + arch/x86/xen/time.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +diff --git a/arch/x86/xen/time.c b/arch/x86/xen/time.c +index 03706331f567..8ecc38110bcc 100644 --- a/arch/x86/xen/time.c +++ b/arch/x86/xen/time.c @@ -516,7 +516,7 @@ static void __init xen_time_init(void) @@ -23,18 +23,10 @@ Signed-off-by: Greg Kroah-Hartman } -void __ref xen_init_time_ops(void) -+void xen_init_time_ops(void) ++void __init xen_init_time_ops(void) { xen_sched_clock_offset = xen_clocksource_read(); pv_time_ops = xen_time_ops; ---- a/arch/x86/xen/xen-ops.h -+++ b/arch/x86/xen/xen-ops.h -@@ -72,7 +72,7 @@ u64 xen_clocksource_read(void); - void xen_setup_cpu_clockevents(void); - void xen_save_time_memory_area(void); - void xen_restore_time_memory_area(void); --void __init xen_init_time_ops(void); -+void xen_init_time_ops(void); - void __init xen_hvm_init_time_ops(void); - - irqreturn_t xen_debug_interrupt(int irq, void *dev_id); +-- +2.39.1 +