diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-09-02 09:10:07 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-09-02 09:10:07 +0200 |
| commit | 77e5517cb506c5b1e0a91bf4774cc95452659d77 (patch) | |
| tree | e057ab71829a12ded68d9d22e661f0e391b5ad6b /arch/x86/kernel/apic/apic.c | |
| parent | a3d8c0d13bdedf84fe74259f6949b2cdffd80e55 (diff) | |
| parent | 9f159ae07f07fc540290f21937231034f554bdd7 (diff) | |
| download | linux-77e5517cb506c5b1e0a91bf4774cc95452659d77.tar.bz2 | |
Merge branch 'linus' into x86/cpu, to resolve conflicts
Conflicts:
tools/power/x86/turbostat/turbostat.c
Recent turbostat changes conflicted with a pending rename of x86 model names in tip:x86/cpu,
sort it out.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/apic/apic.c')
| -rw-r--r-- | arch/x86/kernel/apic/apic.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c index 1026138eb830..78f7e763f2cd 100644 --- a/arch/x86/kernel/apic/apic.c +++ b/arch/x86/kernel/apic/apic.c @@ -1179,6 +1179,10 @@ void clear_local_APIC(void) apic_write(APIC_LVT0, v | APIC_LVT_MASKED); v = apic_read(APIC_LVT1); apic_write(APIC_LVT1, v | APIC_LVT_MASKED); + if (!x2apic_enabled()) { + v = apic_read(APIC_LDR) & ~APIC_LDR_MASK; + apic_write(APIC_LDR, v); + } if (maxlvt >= 4) { v = apic_read(APIC_LVTPC); apic_write(APIC_LVTPC, v | APIC_LVT_MASKED); |