| commit | 69ea03b56ed2c7189ccd0b5910ad39f3cad1df21 | [log] [tgz] |
|---|---|---|
| author | Peter Zijlstra <[email protected]> | Wed Feb 19 09:46:47 2020 +0100 |
| committer | Thomas Gleixner <[email protected]> | Tue May 19 15:51:17 2020 +0200 |
| tree | f5070915d8d90d28e70b6a467db88c69a73d803e | |
| parent | 28f6bf9e247fe23d177cfdbf7e709270e8cc7fa6 [diff] [blame] |
hardirq/nmi: Allow nested nmi_enter() Since there are already a number of sites (ARM64, PowerPC) that effectively nest nmi_enter(), make the primitive support this before adding even more. Signed-off-by: Peter Zijlstra (Intel) <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]> Acked-by: Marc Zyngier <[email protected]> Acked-by: Will Deacon <[email protected]> Cc: Michael Ellerman <[email protected]> Link: https://lkml.kernel.org/r/[email protected]
diff --git a/include/linux/preempt.h b/include/linux/preempt.h index bc3f1ae..7d9c1c0 100644 --- a/include/linux/preempt.h +++ b/include/linux/preempt.h
@@ -26,13 +26,13 @@ * PREEMPT_MASK: 0x000000ff * SOFTIRQ_MASK: 0x0000ff00 * HARDIRQ_MASK: 0x000f0000 - * NMI_MASK: 0x00100000 + * NMI_MASK: 0x00f00000 * PREEMPT_NEED_RESCHED: 0x80000000 */ #define PREEMPT_BITS 8 #define SOFTIRQ_BITS 8 #define HARDIRQ_BITS 4 -#define NMI_BITS 1 +#define NMI_BITS 4 #define PREEMPT_SHIFT 0 #define SOFTIRQ_SHIFT (PREEMPT_SHIFT + PREEMPT_BITS)