diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-08-10 22:17:12 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-08-10 22:17:12 +0300 |
| commit | c13f86701e1e03fa3f94165d46425ead51a191c8 (patch) | |
| tree | 705012632704cedff349f603fe0f063d05e387a9 /drivers | |
| parent | 15fa98e40e0c305145da9a95f8ac6dc0bda64884 (diff) | |
| parent | 81eaadcae81b4c1bf01649a3053d1f54e2d81cf1 (diff) | |
| download | linux-c13f86701e1e03fa3f94165d46425ead51a191c8.tar.xz | |
Merge tag 'tty-5.3-rc4' of git://git.kernel.org/pub/scm/linux/kernel/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 ddde3c18b700 ("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
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/tty/serial/kgdboc.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/tty/serial/kgdboc.c b/drivers/tty/serial/kgdboc.c index bfe5e9e034ec..c7d51b51898f 100644 --- a/drivers/tty/serial/kgdboc.c +++ b/drivers/tty/serial/kgdboc.c @@ -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); |