fixes for 4.14

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-4.14/series b/queue-4.14/series
index cb4e14f3ee6e294156fac18589de2e5a6afbe840..b91fd8524e4fa0b647660a20165bd2ae40673e9e 100644 (file)
--- 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 (file)
index 0000000..68e12fb
--- /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 <sashal@kernel.org>
+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 <sashal@kernel.org>
+---
+ 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
+