diff options
| author | Ingo Molnar <mingo@kernel.org> | 2020-05-28 10:52:53 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2020-05-28 10:52:53 +0200 |
| commit | 58ef57b16d9e91cce1c640a6fe8a21d53a85181d (patch) | |
| tree | d0f01006c085256fb2b7d9c6030a9425a931ba84 /include/linux/preempt.h | |
| parent | 498bdcdb949e879d4a45f415468aef802a3dff4a (diff) | |
| parent | 806f04e9fd2c6ad1e39bc2dba77155be0e4becde (diff) | |
| download | cachepc-linux-58ef57b16d9e91cce1c640a6fe8a21d53a85181d.tar.gz cachepc-linux-58ef57b16d9e91cce1c640a6fe8a21d53a85181d.zip | |
Merge branch 'core/rcu' into sched/core, to pick up dependency
We are going to rely on the loosening of RCU callback semantics,
introduced by this commit:
806f04e9fd2c: ("rcu: Allow for smp_call_function() running callbacks from idle")
Signed-off-by: Ingo Molnar <mingo@kernel.org>
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) |