Skip to content

Commit

Permalink
Merge tag 'tty-5.3-rc4' of git://git.kernel.org/pub/scm/linux/kernel/…
Browse files Browse the repository at this point in the history
…git/gregkh/tty

Pull tty fix from Greg KH:
 "Here is a single tty kgdb fix for 5.3-rc4.

  It fixes an annoying log message that has caused kdb to become
  useless. It's another fallout from commit ddde3c1 ("vt: More
  locking checks") which tries to enforce locking checks more strictly
  in the tty layer, unfortunatly when kdb is stopped, there's no need
  for locks :)

  This patch has been linux-next for a while with no reported issues"

* tag 'tty-5.3-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
  kgdboc: disable the console lock when in kgdb
  • Loading branch information
torvalds committed Aug 10, 2019
2 parents 15fa98e + 81eaadc commit c13f867
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions drivers/tty/serial/kgdboc.c
Original file line number Diff line number Diff line change
Expand Up @@ -277,10 +277,14 @@ static void kgdboc_pre_exp_handler(void)
/* Increment the module count when the debugger is active */
if (!kgdb_connected)
try_module_get(THIS_MODULE);

atomic_inc(&ignore_console_lock_warning);
}

static void kgdboc_post_exp_handler(void)
{
atomic_dec(&ignore_console_lock_warning);

/* decrement the module count when the debugger detaches */
if (!kgdb_connected)
module_put(THIS_MODULE);
Expand Down

0 comments on commit c13f867

Please sign in to comment.