On Sat, Jul 25, 2015 at 11:05 PM, Borislav Petkov <b...@alien8.de> wrote: > On Fri, Jul 24, 2015 at 10:57:04PM -0700, Andy Lutomirski wrote: >> This will allow IRQ stacks to nest inside NMIs or similar entries >> that can happen during IRQ stack setup or teardown. >> >> The Xen code here has a confusing comment. >> >> The new macros won't work correctly if they're invoked with IRQs on. >> Add a check under CONFIG_DEBUG_ENTRY to detect that. >> >> Signed-off-by: Andy Lutomirski <l...@kernel.org> >> --- >> arch/x86/Kconfig.debug | 2 - >> arch/x86/entry/entry_64.S | 89 >> +++++++++++++++++++++++++++++--------------- >> arch/x86/kernel/process_64.c | 4 ++ >> 3 files changed, 63 insertions(+), 32 deletions(-) > > What does that apply against? > > I get conflicts against current Linus master:
It applies to the result of merging Linus' master with tip/x86/asm. I think it also applies to tip/x86/asm directly, but I haven't tried it. It's an NMI-related thing (sort of), so it seemed sensible to develop against something that has the other NMI fixes. --Andy -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
