Skip to contentSkip to conversation

x86/paravirt for v2.6.38

GIT PULL Ingo Molnar 1 participant 1 message Jan 6, 2011

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

Linus,

Please pull the latest x86-paravirt-for-linus git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git x86-paravirt-for-linus

Thanks,

Ingo

------------------>
Cliff Wickman (1):
x86, paravirt: Use native_halt on a halt, not native_safe_halt

 arch/x86/include/asm/paravirt.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
arch/x86/include/asm/paravirt.h +1 -1
index ef99758..7709c12 100644
@@ -112,7 +112,7 @@ static inline void arch_safe_halt(void)
 
 static inline void halt(void)
 {
-	PVOP_VCALL0(pv_irq_ops.safe_halt);
+	PVOP_VCALL0(pv_irq_ops.halt);
 }
 
 static inline void wbinvd(void)