]> git.baikalelectronics.ru Git - kernel.git/commit
Revert "x86/apic: Only disable CPU x2apic mode when necessary"
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 13 Feb 2015 18:26:18 +0000 (10:26 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 13 Feb 2015 18:26:18 +0000 (10:26 -0800)
commit3aa395cf814aeb0ca407478206e5e8e4c9129fe9
tree7c2287287e44498561e77d9556a99cabc0ead4f6
parent64d013289ba66d4247f6923e741749b5cb359ca6
Revert "x86/apic: Only disable CPU x2apic mode when necessary"

This reverts commit a222b278e4f3b15049afa15749d378d40c497d46.

It causes the suspend to fail on at least the Chromebook Pixel, possibly
other platforms too.

Joerg Roedel points out that the logic should probably have been

                if (max_physical_apicid > 255 ||
                    !(IS_ENABLED(CONFIG_HYPERVISOR_GUEST) &&
                      hypervisor_x2apic_available())) {

instead, but since the code is not in any fast-path, so we can just live
without that optimization and just revert to the original code.

Acked-by: Joerg Roedel <joro@8bytes.org>
Acked-by: Jiang Liu <jiang.liu@linux.intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
arch/x86/kernel/apic/apic.c