diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2019-12-10 05:41:34 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-12-10 05:41:34 +0100 |
| commit | 77d783a5170896aea021ec180e16751a0a249627 (patch) | |
| tree | f61e969576c736cdd4d06f89bf8b8dae22093298 /fs | |
| parent | 293e981e7452511a876431aa076c0eb256623124 (diff) | |
| parent | af86e3a0548e16dc9cef13debd3d64d9091ba473 (diff) | |
| download | barebox-77d783a5170896aea021ec180e16751a0a249627.tar.gz barebox-77d783a5170896aea021ec180e16751a0a249627.tar.xz | |
Merge branch 'for-next/randfixes'
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/pstore/platform.c | 3 | ||||
| -rw-r--r-- | fs/pstore/ram.c | 8 |
2 files changed, 7 insertions, 4 deletions
diff --git a/fs/pstore/platform.c b/fs/pstore/platform.c index 0a6fa38edc..f4b77226d9 100644 --- a/fs/pstore/platform.c +++ b/fs/pstore/platform.c @@ -73,6 +73,9 @@ static void pstore_console_capture_log(void) uint64_t id; struct log_entry *log, *tmp; + if (IS_ENABLED(CONFIG_CONSOLE_NONE)) + return; + list_for_each_entry_safe(log, tmp, &barebox_logbuf, list) { psinfo->write_buf(PSTORE_TYPE_CONSOLE, 0, &id, 0, log->msg, 0, strlen(log->msg), psinfo); diff --git a/fs/pstore/ram.c b/fs/pstore/ram.c index b968579692..958f46b0ea 100644 --- a/fs/pstore/ram.c +++ b/fs/pstore/ram.c @@ -623,10 +623,10 @@ static int ramoops_probe(struct device_d *dev) if (!IS_ENABLED(CONFIG_OFTREE)) { scnprintf(kernelargs, sizeof(kernelargs), - "ramoops.record_size=0x%x " - "ramoops.console_size=0x%x " - "ramoops.ftrace_size=0x%x " - "ramoops.pmsg_size=0x%x " + "ramoops.record_size=0x%zx " + "ramoops.console_size=0x%zx " + "ramoops.ftrace_size=0x%zx " + "ramoops.pmsg_size=0x%zx " "ramoops.mem_address=0x%llx " "ramoops.mem_size=0x%lx " "ramoops.ecc=%d", |