Skip to content
Snippets Groups Projects
Commit 8329aa9f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Revert "x86/apic: Only disable CPU x2apic mode when necessary"


This reverts commit 5fcee53c.

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: default avatarJoerg Roedel <joro@8bytes.org>
Acked-by: default avatarJiang Liu <jiang.liu@linux.intel.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b9085bcb
No related branches found
No related tags found
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment