4.9 fuzz cleanup

diff --git a/queue-4.9/x86-amd-don-t-set-x86_bug_sysret_ss_attrs-when-running-under-xen.patch b/queue-4.9/x86-amd-don-t-set-x86_bug_sysret_ss_attrs-when-running-under-xen.patch
index ef480c6221dab3181856fe6309fc03fbf669b909..366fcf4020185be653a6b9e324db11917ae48c16 100644 (file)
--- a/queue-4.9/x86-amd-don-t-set-x86_bug_sysret_ss_attrs-when-running-under-xen.patch
+++ b/queue-4.9/x86-amd-don-t-set-x86_bug_sysret_ss_attrs-when-running-under-xen.patch
@@ -48,7 +48,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  #ifdef CONFIG_X86_32
 --- a/arch/x86/xen/enlighten.c
 +++ b/arch/x86/xen/enlighten.c
-@@ -473,10 +473,8 @@ static void __init xen_init_cpuid_mask(v
+@@ -474,10 +474,8 @@ static void __init xen_init_cpuid_mask(v
  
  static void __init xen_init_capabilities(void)
  {

diff --git a/queue-4.9/x86-amd-revert-commit-944e0fc51a89c9827b9.patch b/queue-4.9/x86-amd-revert-commit-944e0fc51a89c9827b9.patch
index 2fce26443d7ffef8a29d6c8ee0bdadc5e9468ed7..0367151d5a406b2070f7e090f3091c258d639747 100644 (file)
--- a/queue-4.9/x86-amd-revert-commit-944e0fc51a89c9827b9.patch
+++ b/queue-4.9/x86-amd-revert-commit-944e0fc51a89c9827b9.patch
@@ -35,7 +35,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  #ifdef CONFIG_X86_32
 --- a/arch/x86/xen/enlighten.c
 +++ b/arch/x86/xen/enlighten.c
-@@ -1977,8 +1977,10 @@ EXPORT_SYMBOL_GPL(xen_hvm_need_lapic);
+@@ -1980,8 +1980,10 @@ EXPORT_SYMBOL_GPL(xen_hvm_need_lapic);
  
  static void xen_set_cpu_features(struct cpuinfo_x86 *c)
  {

diff --git a/queue-4.9/xen-set-cpu-capabilities-from-xen_start_kernel.patch b/queue-4.9/xen-set-cpu-capabilities-from-xen_start_kernel.patch
index dd004fa9b965753b98c8e76bcc190cad8b974617..e9e41340e829259008f24bca09c144f5a3b7a06c 100644 (file)
--- a/queue-4.9/xen-set-cpu-capabilities-from-xen_start_kernel.patch
+++ b/queue-4.9/xen-set-cpu-capabilities-from-xen_start_kernel.patch
@@ -24,7 +24,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 --- a/arch/x86/xen/enlighten.c
 +++ b/arch/x86/xen/enlighten.c
-@@ -471,6 +471,14 @@ static void __init xen_init_cpuid_mask(v
+@@ -472,6 +472,14 @@ static void __init xen_init_cpuid_mask(v
                cpuid_leaf1_ecx_set_mask = (1 << (X86_FEATURE_MWAIT % 32));
  }
  
@@ -39,7 +39,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  static void xen_set_debugreg(int reg, unsigned long val)
  {
        HYPERVISOR_set_debugreg(reg, val);
-@@ -1631,6 +1639,7 @@ asmlinkage __visible void __init xen_sta
+@@ -1634,6 +1642,7 @@ asmlinkage __visible void __init xen_sta
  
        xen_init_irq_ops();
        xen_init_cpuid_mask();
@@ -47,7 +47,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  
  #ifdef CONFIG_X86_LOCAL_APIC
        /*
-@@ -1975,14 +1984,6 @@ bool xen_hvm_need_lapic(void)
+@@ -1978,14 +1987,6 @@ bool xen_hvm_need_lapic(void)
  }
  EXPORT_SYMBOL_GPL(xen_hvm_need_lapic);
  
@@ -62,7 +62,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  static void xen_pin_vcpu(int cpu)
  {
        static bool disable_pinning;
-@@ -2029,7 +2030,6 @@ const struct hypervisor_x86 x86_hyper_xe
+@@ -2032,7 +2033,6 @@ const struct hypervisor_x86 x86_hyper_xe
        .init_platform          = xen_hvm_guest_init,
  #endif
        .x2apic_available       = xen_x2apic_para_available,