diff options
| author |   Petr Mladek <pmladek@suse.com> | 2019-09-16 12:54:25 +0200 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.com> | 2019-09-16 12:54:25 +0200 |
| commit | ae88de56a1893bdccc7b5af8c12556de649d675e (patch) | |
| tree | e3b70d7df5d379c20ac15d9fea3a7642e1f2f3e1 /kernel | |
| parent | printk: Do not lose last line in kmsg buffer dump (diff) | |
| parent | ABI: Update dev-kmsg documentation to match current kernel behaviour (diff) | |
| download | linux-dev-ae88de56a1893bdccc7b5af8c12556de649d675e.tar.xz linux-dev-ae88de56a1893bdccc7b5af8c12556de649d675e.zip | |
Merge branch 'for-5.4' into for-linus
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/printk/braille.c | 15 | ||||
| -rw-r--r-- | kernel/printk/printk.c | 22 |
2 files changed, 27 insertions, 10 deletions
diff --git a/kernel/printk/braille.c b/kernel/printk/braille.c index 1d21ebacfdb8..17a9591e54ff 100644 --- a/kernel/printk/braille.c +++ b/kernel/printk/braille.c @@ -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"); diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index 424abf802f02..ca65327a6de8 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -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)) { + return len; + } + + len = str_has_prefix(str, "off"); + if (len) { devkmsg_log = DEVKMSG_LOG_MASK_OFF; - return 3; - } else if (!strncmp(str, "ratelimit", 9)) { + return len; + } + + len = str_has_prefix(str, "ratelimit"); + if (len) { devkmsg_log = DEVKMSG_LOG_MASK_DEFAULT; - return 9; + return len; } + return -EINVAL; } |