ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-22 20:30:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'kgdb-6.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux

Browse Source 
Pull kgdb updates from Daniel Thompson:
 "Fairly small changes this cycle:

   - An additional static inline function when kgdb is not enabled to
     reduce boilerplate in arch files

   - kdb will now handle input with linefeeds more like carriage return.
     This will make little difference for interactive use but can make
     it script to use expect-like interaction with kdb

   - A couple of warning fixes"

* tag 'kgdb-6.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux:
  kdb: move kdb_send_sig() declaration to a better header file
  kdb: Handle LF in the command parser
  kdb: include kdb_private.h for function prototypes
  kgdb: Provide a stub kgdb_nmicallback() if !CONFIG_KGDB
This commit is contained in:
Linus Torvalds
2023-07-03 15:19:56 -07:00
parent 56cbceab92 b6464883f4
commit eded37770c
5 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
kernel/debug/kdb/kdb_io.c
View File

@@ -131,6 +131,7 @@ char kdb_getchar(void)
int escape_delay = 0;
get_char_func *f, *f_prev = NULL;
int key;
static bool last_char_was_cr;
for (f = &kdb_poll_funcs[0]; ; ++f) {
if (*f == NULL) {
@@ -149,6 +150,18 @@ char kdb_getchar(void)
continue;
}
/*
* The caller expects that newlines are either CR or LF. However
* some terminals send _both_ CR and LF. Avoid having to handle
* this in the caller by stripping the LF if we saw a CR right
* before.
*/
if (last_char_was_cr && key == '\n') {
last_char_was_cr = false;
continue;
}
last_char_was_cr = (key == '\r');
/*
* When the first character is received (or we get a change
* input source) we set ourselves up to handle an escape
@@ -244,7 +257,8 @@ poll_again:
*cp = tmp;
}
break;
case 13: /* enter */
case 10: /* linefeed */
case 13: /* carriage return */
*lastchar++ = '\n';
*lastchar++ = '\0';
if (!KDB_STATE(KGDB_TRANS)) {

2
kernel/debug/kdb/kdb_keyboard.c
View File

@@ -13,6 +13,8 @@
#include <linux/ctype.h>
#include <linux/io.h>
#include "kdb_private.h"
/* Keyboard Controller Registers on normal PCs. */
#define KBD_STATUS_REG 0x64 /* Status register (R) */

1
kernel/debug/kdb/kdb_private.h
View File

@@ -194,7 +194,6 @@ extern char kdb_task_state_char (const struct task_struct *);
extern bool kdb_task_state(const struct task_struct *p, const char *mask);
extern void kdb_ps_suppressed(void);
extern void kdb_ps1(const struct task_struct *p);
extern void kdb_send_sig(struct task_struct *p, int sig);
extern char kdb_getchar(void);
extern char *kdb_getstr(char *, size_t, const char *);
extern void kdb_gdb_state_pass(char *buf);