]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
Merge branch 'rework/write_atomic-unsafe' into for-linus
authorPetr Mladek <pmladek@suse.com>
Mon, 1 Dec 2025 13:17:04 +0000 (14:17 +0100)
committerPetr Mladek <pmladek@suse.com>
Mon, 1 Dec 2025 13:17:04 +0000 (14:17 +0100)
1  2 
kernel/printk/nbcon.c

index 0bbb03fde35d7c66bd6f6d8f408a363c4ec92cb2,90412c2b296161db630b6a1db30209c2c8432bde..3fa403f9831f044fa88292c87ba06f43ade186e1
@@@ -1536,12 -1525,12 +1554,12 @@@ static int __nbcon_atomic_flush_pending
        ctxt->console                   = con;
        ctxt->spinwait_max_us           = 2000;
        ctxt->prio                      = nbcon_get_default_prio();
-       ctxt->allow_unsafe_takeover     = allow_unsafe_takeover;
+       ctxt->allow_unsafe_takeover     = nbcon_allow_unsafe_takeover();
  
 -      if (!nbcon_context_try_acquire(ctxt, false))
 -              return -EPERM;
 -
        while (nbcon_seq_read(con) < stop_seq) {
 +              if (!nbcon_context_try_acquire(ctxt, false))
 +                      return -EPERM;
 +
                /*
                 * nbcon_emit_next_record() returns false when the console was
                 * handed over or taken over. In both cases the context is no