* [GIT PULL] x86/paravirt for v2.6.38
@ 2011-01-06 10:35 Ingo Molnar
0 siblings, 0 replies; only message in thread
From: Ingo Molnar @ 2011-01-06 10:35 UTC (permalink / raw)
To: Linus Torvalds
Cc: linux-kernel, Thomas Gleixner, H. Peter Anvin, Andrew Morton
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(-)
diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h
index ef99758..7709c12 100644
--- a/arch/x86/include/asm/paravirt.h
+++ b/arch/x86/include/asm/paravirt.h
@@ -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)
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2011-01-06 10:36 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-01-06 10:35 [GIT PULL] x86/paravirt for v2.6.38 Ingo Molnar
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox