From: Greg Kroah-Hartman Date: Mon, 30 Jan 2023 12:56:39 +0000 (+0100) Subject: 4.14-stable patches X-Git-Tag: v5.10.166~14 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=614ab5dbc4b216a8306a98bccf592575dd92c196;p=thirdparty%2Fkernel%2Fstable-queue.git 4.14-stable patches added patches: xen-fix-up-build-warning-with-xen_init_time_ops-reference.patch --- diff --git a/queue-4.14/series b/queue-4.14/series index 2776f6e4703..dbcc983004b 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -38,3 +38,4 @@ net-tg3-resolve-deadlock-in-tg3_reset_task-during-ee.patch revert-input-synaptics-switch-touchpad-on-hp-laptop-15-da3001tu-to-rmi-mode.patch x86-i8259-mark-legacy-pic-interrupts-with-irq_level.patch wifi-brcmfmac-fix-up-incorrect-4.14.y-backport-for-brcmf_fw_map_chip_to_name.patch +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 new file mode 100644 index 00000000000..53bd685313a --- /dev/null +++ b/queue-4.14/xen-fix-up-build-warning-with-xen_init_time_ops-reference.patch @@ -0,0 +1,32 @@ +From 5f9dc72c3a1b1c79e226263d61bcf25326d4e37f Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman +Date: Mon, 30 Jan 2023 13:51:51 +0100 +Subject: xen: Fix up build warning with xen_init_time_ops() reference + +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 making xen_init_time_ops() be __init, not __ref. + +Signed-off-by: Greg Kroah-Hartman +--- + 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) + pvclock_gtod_register_notifier(&xen_pvclock_gtod_notifier); + } + +-void __ref 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; +-- +2.39.1 +