[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <tip-c8217b8305e5e75c23617f2f4cd262527d952c0a@git.kernel.org>
Date: Mon, 27 Dec 2010 23:00:51 GMT
From: tip-bot for Cliff Wickman <cpw@....com>
To: linux-tip-commits@...r.kernel.org
Cc: linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...hat.com,
cpw@....com, tglx@...utronix.de, hpa@...ux.intel.com
Subject: [tip:x86/paravirt] x86, paravirt: Use native_halt on a halt, not native_safe_halt
Commit-ID: c8217b8305e5e75c23617f2f4cd262527d952c0a
Gitweb: http://git.kernel.org/tip/c8217b8305e5e75c23617f2f4cd262527d952c0a
Author: Cliff Wickman <cpw@....com>
AuthorDate: Mon, 13 Dec 2010 10:51:57 -0600
Committer: H. Peter Anvin <hpa@...ux.intel.com>
CommitDate: Mon, 27 Dec 2010 14:02:11 -0800
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 <cpw@....com>
LKML-Reference: <E1PSBcz-0001g1-FM@...09.americas.sgi.com>
Signed-off-by: H. Peter Anvin <hpa@...ux.intel.com>
---
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)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists