Merge tag 'v4.9.241' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into odroidg12-4.9.y

This is the 4.9.241 stable release

Change-Id: I3b60fa5279b42cdc734aa4ceec1cf0e404a697f8
This commit is contained in:
Mauro (mdrjr) Ribeiro
2020-12-22 09:20:57 -03:00
144 changed files with 888 additions and 475 deletions

View File

@@ -692,12 +692,16 @@ int vkdb_printf(enum kdb_msgsrc src, const char *fmt, va_list ap)
size_avail = sizeof(kdb_buffer) - len;
goto kdb_print_out;
}
if (kdb_grepping_flag >= KDB_GREPPING_FLAG_SEARCH)
if (kdb_grepping_flag >= KDB_GREPPING_FLAG_SEARCH) {
/*
* This was a interactive search (using '/' at more
* prompt) and it has completed. Clear the flag.
* prompt) and it has completed. Replace the \0 with
* its original value to ensure multi-line strings
* are handled properly, and return to normal mode.
*/
*cphold = replaced_byte;
kdb_grepping_flag = 0;
}
/*
* at this point the string is a full line and
* should be printed, up to the null.