From: Greg Kroah-Hartman Date: Wed, 27 Nov 2019 20:10:52 +0000 (+0100) Subject: add my s-o-b to a 4.14 patch X-Git-Tag: v4.4.204~9 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f147b0741a341c03fa4bfa64325a6e02c53f2d2c;p=thirdparty%2Fkernel%2Fstable-queue.git add my s-o-b to a 4.14 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 index 68e12fb6f54..57e20b1c239 100644 --- 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 @@ -3,6 +3,8 @@ From: Sasha Levin Date: Wed, 27 Nov 2019 14:56:37 -0500 Subject: x86/hyperv: mark hyperv_init as __init function +From: Sasha Levin + 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. @@ -10,12 +12,11 @@ functionality we don't want to backport. This change eliminates a build warning. Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman --- - arch/x86/hyperv/hv_init.c | 2 +- + 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) @@ -27,6 +28,3 @@ index 2653b7b25d176..924fa9c073681 100644 { u64 guest_id, required_msrs; union hv_x64_msr_hypercall_contents hypercall_msr; --- -2.20.1 -