]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
add my s-o-b to a 4.14 patch
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 27 Nov 2019 20:10:52 +0000 (21:10 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 27 Nov 2019 20:10:52 +0000 (21:10 +0100)
queue-4.14/x86-hyperv-mark-hyperv_init-as-__init-function.patch

index 68e12fb6f544097ff7b485cb1ed02bb1f37a7e5d..57e20b1c239815591b3fa57cc87380f528ada90b 100644 (file)
@@ -3,6 +3,8 @@ From: Sasha Levin <sashal@kernel.org>
 Date: Wed, 27 Nov 2019 14:56:37 -0500
 Subject: x86/hyperv: mark hyperv_init as __init function
 
+From: Sasha Levin <sashal@kernel.org>
+
 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 <sashal@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
- 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
-