Skip to content

Commit c8217b8

Browse files
cpwickmanH. Peter Anvin
authored andcommitted
x86, paravirt: Use native_halt on a halt, not native_safe_halt
halt() should use native_halt() safe_halt() uses native_safe_halt() If CONFIG_PARAVIRT=y, halt() is defined in arch/x86/include/asm/paravirt.h as static inline void halt(void) { PVOP_VCALL0(pv_irq_ops.safe_halt); } Otherwise (no CONFIG_PARAVIRT) halt() in arch/x86/include/asm/irqflags.h is static inline void halt(void) { native_halt(); } So it looks to me like the CONFIG_PARAVIRT case of using native_safe_halt() for a halt() is an oversight. Am I missing something? It probably hasn't shown up as a problem because the local apic is disabled on a shutdown or restart. But if we disable interrupts and call halt() we shouldn't expect that the halt() will re-enable interrupts. Signed-off-by: Cliff Wickman <[email protected]> LKML-Reference: <[email protected]> Signed-off-by: H. Peter Anvin <[email protected]>
1 parent 90a8a73 commit c8217b8

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

arch/x86/include/asm/paravirt.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ static inline void arch_safe_halt(void)
112112

113113
static inline void halt(void)
114114
{
115-
PVOP_VCALL0(pv_irq_ops.safe_halt);
115+
PVOP_VCALL0(pv_irq_ops.halt);
116116
}
117117

118118
static inline void wbinvd(void)

0 commit comments

Comments
 (0)