xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'for-5.4' into for-linus

Browse Source
This commit is contained in:
Petr Mladek
2019-09-16 12:54:25 +02:00
parent c9dccacfcc 085a3a8fdf
commit ae88de56a1
5 changed files with 51 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
kernel/printk/braille.c
View File

@@ -11,11 +11,18 @@
int _braille_console_setup(char **str, char **brl_options)
{
if (!strncmp(*str, "brl,", 4)) {
size_t len;
len = str_has_prefix(*str, "brl,");
if (len) {
*brl_options = "";
*str += 4;
} else if (!strncmp(*str, "brl=", 4)) {
*brl_options = *str + 4;
*str += len;
return 0;
}
len = str_has_prefix(*str, "brl=");
if (len) {
*brl_options = *str + len;
*str = strchr(*brl_options, ',');
if (!*str) {
pr_err("need port name after brl=\n");

26
kernel/printk/printk.c
View File

@@ -118,19 +118,29 @@ static unsigned int __read_mostly devkmsg_log = DEVKMSG_LOG_MASK_DEFAULT;
static int __control_devkmsg(char *str)
{
size_t len;
if (!str)
return -EINVAL;
if (!strncmp(str, "on", 2)) {
len = str_has_prefix(str, "on");
if (len) {
devkmsg_log = DEVKMSG_LOG_MASK_ON;
return 2;
} else if (!strncmp(str, "off", 3)) {
devkmsg_log = DEVKMSG_LOG_MASK_OFF;
return 3;
} else if (!strncmp(str, "ratelimit", 9)) {
devkmsg_log = DEVKMSG_LOG_MASK_DEFAULT;
return 9;
return len;
}
len = str_has_prefix(str, "off");
if (len) {
devkmsg_log = DEVKMSG_LOG_MASK_OFF;
return len;
}
len = str_has_prefix(str, "ratelimit");
if (len) {
devkmsg_log = DEVKMSG_LOG_MASK_DEFAULT;
return len;
}
return -EINVAL;
}