shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-11 13:27:06 +09:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
parent ecbe01e439 d69a20c916
commit f9de720d00
144 changed files with 888 additions and 475 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
kernel/debug/kdb/kdb_io.c
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.

11
kernel/power/hibernate.c
View File

@@ -834,17 +834,6 @@ static int software_resume(void)
/* Check if the device is there */
swsusp_resume_device = name_to_dev_t(resume_file);
/*
* name_to_dev_t is ineffective to verify parition if resume_file is in
* integer format. (e.g. major:minor)
*/
if (isdigit(resume_file[0]) && resume_wait) {
int partno;
while (!get_gendisk(swsusp_resume_device, &partno))
msleep(10);
}
if (!swsusp_resume_device) {
/*
* Some device discovery might still be in progress; we need