]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
fixup patch
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 31 Dec 2017 12:14:30 +0000 (13:14 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 31 Dec 2017 12:14:30 +0000 (13:14 +0100)
queue-4.4/x86-mm-enable-cr4.pcide-on-supported-systems.patch
queue-4.9/x86-mm-enable-cr4.pcide-on-supported-systems.patch

index 63185336517b09783db2be11cfb16c893f8a5b2d..022d338480ac581e669f8ff65bcdb8ab4cf907c7 100644 (file)
@@ -101,7 +101,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 +       * Xen PV would need some work to support PCID: CR3 handling as well
 +       * as xen_flush_tlb_others() would need updating.
 +       */
-+      cpuid_leaf1_ecx_mask &= ~(1 << X86_FEATURE_PCID);  /* disable PCID */
++      cpuid_leaf1_ecx_mask &= ~(1 << (X86_FEATURE_PCID % 32));  /* disable PCID */
 +
        if (!xen_initial_domain())
                cpuid_leaf1_edx_mask &=
index de330d8172eb507d3d9d0d1909c8d7a15310382c..87224955d4354aec39d4147c5aa01d95211940be 100644 (file)
@@ -101,7 +101,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 +       * Xen PV would need some work to support PCID: CR3 handling as well
 +       * as xen_flush_tlb_others() would need updating.
 +       */
-+      cpuid_leaf1_ecx_mask &= ~(1 << X86_FEATURE_PCID);  /* disable PCID */
++      cpuid_leaf1_ecx_mask &= ~(1 << (X86_FEATURE_PCID % 32));  /* disable PCID */
 +
        if (!xen_initial_domain())
                cpuid_leaf1_edx_mask &=