Commit 15e95037 authored by Masami Hiramatsu's avatar Masami Hiramatsu Committed by Steven Rostedt (VMware)

tools/bootconfig: Remove unneeded error message silencer

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@devnote2Signed-off-by: default avatarMasami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: default avatarSteven Rostedt (VMware) <rostedt@goodmis.org>
parent 85c46b78
...@@ -4,10 +4,7 @@ ...@@ -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
......
...@@ -14,8 +14,6 @@ ...@@ -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) ...@@ -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);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment