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 /kernel/printk/internal.h | |
| parent | 498bdcdb949e879d4a45f415468aef802a3dff4a (diff) | |
| parent | 806f04e9fd2c6ad1e39bc2dba77155be0e4becde (diff) | |
| download | lwn-58ef57b16d9e91cce1c640a6fe8a21d53a85181d.tar.gz lwn-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 'kernel/printk/internal.h')
| -rw-r--r-- | kernel/printk/internal.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/kernel/printk/internal.h b/kernel/printk/internal.h index b2b0f526f249..660f9a6bf73a 100644 --- a/kernel/printk/internal.h +++ b/kernel/printk/internal.h @@ -6,9 +6,11 @@ #ifdef CONFIG_PRINTK -#define PRINTK_SAFE_CONTEXT_MASK 0x3fffffff -#define PRINTK_NMI_DIRECT_CONTEXT_MASK 0x40000000 -#define PRINTK_NMI_CONTEXT_MASK 0x80000000 +#define PRINTK_SAFE_CONTEXT_MASK 0x007ffffff +#define PRINTK_NMI_DIRECT_CONTEXT_MASK 0x008000000 +#define PRINTK_NMI_CONTEXT_MASK 0xff0000000 + +#define PRINTK_NMI_CONTEXT_OFFSET 0x010000000 extern raw_spinlock_t logbuf_lock; |