Skip to content

Commit 322f8b8

Browse files
KAGA-KOKOIngo Molnar
authored andcommitted
x86/smpboot: Remove stale TLB flush invocations
smpboot_setup_warm_reset_vector() and smpboot_restore_warm_reset_vector() invoke local_flush_tlb() for no obvious reason. Digging in history revealed that the original code in the 2.1 era added those because the code manipulated a swapper_pg_dir pagetable entry. The pagetable manipulation was removed long ago in the 2.3 timeframe, but the TLB flush invocations stayed around forever. Remove them along with the pointless pr_debug()s which come from the same 2.1 change. Reported-by: Dominik Brodowski <linux@dominikbrodowski.net> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: <stable@vger.kernel.org> Cc: Andy Lutomirski <luto@kernel.org> Cc: Borislav Petkov <bp@alien8.de> Cc: Dave Hansen <dave.hansen@linux.intel.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Linus Torvalds <torvalds@linuxfoundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Link: http://lkml.kernel.org/r/20171230211829.586548655@linutronix.de Signed-off-by: Ingo Molnar <mingo@kernel.org>
1 parent 9f5cb6b commit 322f8b8

File tree

1 file changed

+0
-9
lines changed

1 file changed

+0
-9
lines changed

arch/x86/kernel/smpboot.c

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -128,25 +128,16 @@ static inline void smpboot_setup_warm_reset_vector(unsigned long start_eip)
128128
spin_lock_irqsave(&rtc_lock, flags);
129129
CMOS_WRITE(0xa, 0xf);
130130
spin_unlock_irqrestore(&rtc_lock, flags);
131-
local_flush_tlb();
132-
pr_debug("1.\n");
133131
*((volatile unsigned short *)phys_to_virt(TRAMPOLINE_PHYS_HIGH)) =
134132
start_eip >> 4;
135-
pr_debug("2.\n");
136133
*((volatile unsigned short *)phys_to_virt(TRAMPOLINE_PHYS_LOW)) =
137134
start_eip & 0xf;
138-
pr_debug("3.\n");
139135
}
140136

141137
static inline void smpboot_restore_warm_reset_vector(void)
142138
{
143139
unsigned long flags;
144140

145-
/*
146-
* Install writable page 0 entry to set BIOS data area.
147-
*/
148-
local_flush_tlb();
149-
150141
/*
151142
* Paranoid: Set warm reset code and vector here back
152143
* to default values.

0 commit comments

Comments
 (0)