From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 3 Feb 2023 10:02:53 +0000 (+0100)
Subject: fix up queue-4.14/xen-fix-up-build-warning-with-xen_init_time_ops-reference.patch
X-Git-Tag: v4.14.305~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=45c2738b177f6813cb63821396b8ee71decb0b13;p=thirdparty%2Fkernel%2Fstable-queue.git

fix up queue-4.14/xen-fix-up-build-warning-with-xen_init_time_ops-reference.patch
---

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 53bd685313a..36fed0bbb28 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 <gregkh@linuxfoundation.org>
 
 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 making xen_init_time_ops() be __init, not __ref.
+that up by removing the __ref and __init marking for xen_init_time_ops()
+to resolve all build warnings.
 
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
- arch/x86/xen/time.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ arch/x86/xen/time.c    |    2 +-
+ arch/x86/xen/xen-ops.h |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
 
-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,10 +23,18 @@ index 03706331f567..8ecc38110bcc 100644
  }
  
 -void __ref xen_init_time_ops(void)
-+void __init xen_init_time_ops(void)
++void xen_init_time_ops(void)
  {
  	xen_sched_clock_offset = xen_clocksource_read();
  	pv_time_ops = xen_time_ops;
--- 
-2.39.1
-
+--- 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);