From: Sasha Levin Date: Wed, 27 Nov 2019 19:57:40 +0000 (-0500) Subject: fixes for 4.14 X-Git-Tag: v4.4.204~10^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=da99326537af73556413a7a1d52b353a8c9f51f1;p=thirdparty%2Fkernel%2Fstable-queue.git fixes for 4.14 Signed-off-by: Sasha Levin --- diff --git a/queue-4.14/series b/queue-4.14/series index cb4e14f3ee6..b91fd8524e4 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -194,3 +194,4 @@ media-b2c2-flexcop-usb-add-sanity-checking.patch media-cxusb-detect-cxusb_ctrl_msg-error-in-query.patch media-imon-invalid-dereference-in-imon_touch_event.patch virtio_ring-fix-return-code-on-dma-mapping-fails.patch +x86-hyperv-mark-hyperv_init-as-__init-function.patch diff --git a/queue-4.14/x86-hyperv-mark-hyperv_init-as-__init-function.patch b/queue-4.14/x86-hyperv-mark-hyperv_init-as-__init-function.patch new file mode 100644 index 00000000000..68e12fb6f54 --- /dev/null +++ b/queue-4.14/x86-hyperv-mark-hyperv_init-as-__init-function.patch @@ -0,0 +1,32 @@ +From ac0c6f3f1b80c75bfc790c898bb4bfc343a3d058 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Wed, 27 Nov 2019 14:56:37 -0500 +Subject: x86/hyperv: mark hyperv_init as __init function + +This change was done upstream as part of 6b48cb5f8347 ("X86/Hyper-V: +Enlighten APIC access"), but that commit introduced a lot of new +functionality we don't want to backport. + +This change eliminates a build warning. + +Signed-off-by: Sasha Levin +--- + arch/x86/hyperv/hv_init.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/x86/hyperv/hv_init.c b/arch/x86/hyperv/hv_init.c +index 2653b7b25d176..924fa9c073681 100644 +--- a/arch/x86/hyperv/hv_init.c ++++ b/arch/x86/hyperv/hv_init.c +@@ -125,7 +125,7 @@ static int __init hv_pci_init(void) + * 1. Setup the hypercall page. + * 2. Register Hyper-V specific clocksource. + */ +-void hyperv_init(void) ++void __init hyperv_init(void) + { + u64 guest_id, required_msrs; + union hv_x64_msr_hypercall_contents hypercall_msr; +-- +2.20.1 +