]> git.karo-electronics.de Git - mv-sheeva.git/commit
x86, paravirt: Use native_halt on a halt, not native_safe_halt
authorCliff Wickman <cpw@sgi.com>
Mon, 13 Dec 2010 16:51:57 +0000 (10:51 -0600)
committerH. Peter Anvin <hpa@linux.intel.com>
Mon, 27 Dec 2010 22:02:11 +0000 (14:02 -0800)
commitc8217b8305e5e75c23617f2f4cd262527d952c0a
treeb7bc356f5021cbbb21ee24d00c9e94f03f6d35c4
parent90a8a73c06cc32b609a880d48449d7083327e11a
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>
arch/x86/include/asm/paravirt.h