Re: [PATCH v2 1/3] x86/entry/64: Refactor IRQ stacks and make them NMI-safe

[Borislav Petkov <bp@alien8.de>]

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 <luto@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:

$ patch -p1 --dry-run -i /tmp/0001-x86-entry-64-refactor_irq_stacks_and_make_them_nmi-safe.patch 
checking file arch/x86/Kconfig.debug
checking file arch/x86/entry/entry_64.S
Hunk #1 succeeded at 544 (offset 54 lines).
Hunk #2 FAILED at 568.
Hunk #3 FAILED at 598.
Hunk #4 succeeded at 1012 (offset 99 lines).
Hunk #5 succeeded at 1033 (offset 99 lines).
2 out of 5 hunks FAILED
checking file arch/x86/kernel/process_64.c

-- 
Regards/Gruss,
    Boris.

ECO tip #101: Trim your mails when you reply.
--