diff options
| author |   Peter Zijlstra <peterz@infradead.org> | 2020-02-19 09:46:47 +0100 |
|---|---|---|
| committer |   Thomas Gleixner <tglx@linutronix.de> | 2020-05-19 15:51:17 +0200 |
| commit | 69ea03b56ed2c7189ccd0b5910ad39f3cad1df21 (patch) | |
| tree | f5070915d8d90d28e70b6a467db88c69a73d803e /include/linux/preempt.h | |
| parent | arm64: Prepare arch_nmi_enter() for recursion (diff) | |
| download | wireguard-linux-69ea03b56ed2c7189ccd0b5910ad39f3cad1df21.tar.xz wireguard-linux-69ea03b56ed2c7189ccd0b5910ad39f3cad1df21.zip | |
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) <peterz@infradead.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Marc Zyngier <maz@kernel.org>
Acked-by: Will Deacon <will@kernel.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lkml.kernel.org/r/20200505134100.864179229@linutronix.de
Diffstat (limited to 'include/linux/preempt.h')
| -rw-r--r-- | include/linux/preempt.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/preempt.h b/include/linux/preempt.h index bc3f1aecaa19..7d9c1c0e149c 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) |