diff options
author | Cliff Wickman <cpw@sgi.com> | 2010-12-13 10:51:57 -0600 |
---|---|---|
committer | H. Peter Anvin <hpa@linux.intel.com> | 2010-12-27 14:02:11 -0800 |
commit | c8217b8305e5e75c23617f2f4cd262527d952c0a (patch) | |
tree | b7bc356f5021cbbb21ee24d00c9e94f03f6d35c4 /arch/x86/include/asm/paravirt.h | |
parent | 90a8a73c06cc32b609a880d48449d7083327e11a (diff) | |
download | kernel_samsung_smdk4412-c8217b8305e5e75c23617f2f4cd262527d952c0a.zip kernel_samsung_smdk4412-c8217b8305e5e75c23617f2f4cd262527d952c0a.tar.gz kernel_samsung_smdk4412-c8217b8305e5e75c23617f2f4cd262527d952c0a.tar.bz2 |
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@sgi.com>
LKML-Reference: <E1PSBcz-0001g1-FM@eag09.americas.sgi.com>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/x86/include/asm/paravirt.h')
-rw-r--r-- | 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) |