Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-04 04:06:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

tools/bootconfig: Remove unneeded error message silencer

Browse Source 
Remove error message silent knob, we don't need it anymore
because we can check if there is a bootconfig by checking
the magic word.
If there is a magic word, but failed to load a bootconfig
from initrd, there is a real problem.

Link: http://lkml.kernel.org/r/158220113256.26565.14264598654427773104.stgit@devnote2

Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
This commit is contained in:
Masami Hiramatsu 2020-02-20 21:18:52 +09:00 committed by Steven Rostedt (VMware)
parent 85c46b78da
commit 15e95037b4
2 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tools/bootconfig/include/linux/printk.h
View File

@ -4,10 +4,7 @@
#include <stdio.h> #include <stdio.h>
/* controllable printf */ #define printk(fmt, ...) printf(fmt, ##__VA_ARGS__)
extern int pr_output;
#define printk(fmt, ...) \
(pr_output ? printf(fmt, ##__VA_ARGS__) : 0)
#define pr_err printk #define pr_err printk
#define pr_warn printk #define pr_warn printk

8
tools/bootconfig/main.c
View File

@ -14,8 +14,6 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/bootconfig.h> #include <linux/bootconfig.h>
int pr_output = 1;
static int xbc_show_array(struct xbc_node *node) static int xbc_show_array(struct xbc_node *node)
{ {
const char *val; const char *val;
@ -227,13 +225,7 @@ int delete_xbc(const char *path)
return -errno; return -errno;
} }
/*
* Suppress error messages in xbc_init() because it can be just a
* data which concidentally matches the size and checksum footer.
*/
pr_output = 0;
size = load_xbc_from_initrd(fd, &buf); size = load_xbc_from_initrd(fd, &buf);
pr_output = 1;
if (size < 0) { if (size < 0) {
ret = size; ret = size;
pr_err("Failed to load a boot config from initrd: %d\n", ret); pr_err("Failed to load a boot config from initrd: %d\n", ret);