On (05/19/17 11:58), Sergey Senozhatsky wrote:
> > void printk_nmi_exit(void)
> > {
> > - this_cpu_and(printk_context, ~PRINTK_NMI_CONTEXT_MASK);
> > + this_cpu_and(printk_context,
> > + ~(PRINTK_NMI_CONTEXT_MASK ||
> > + PRINTK_NMI_DEFERRED_CONTEXT_MASK));
> > }
[..]
> the problem is that
>
> `PRINTK_NMI_CONTEXT_MASK || PRINTK_NMI_DEFERRED_CONTEXT_MASK' is 0x01
d'oh... forgot to copy-paste this...
---
diff --git a/kernel/printk/printk_safe.c b/kernel/printk/printk_safe.c
index 6fec9cfb9a69..b6ff3fe4370a 100644
--- a/kernel/printk/printk_safe.c
+++ b/kernel/printk/printk_safe.c
@@ -324,7 +324,7 @@ void printk_nmi_enter(void)
void printk_nmi_exit(void)
{
this_cpu_and(printk_context,
- ~(PRINTK_NMI_CONTEXT_MASK ||
+ ~(PRINTK_NMI_CONTEXT_MASK |
PRINTK_NMI_DEFERRED_CONTEXT_MASK));
}
---
-ss
