diff options
author | Ji Zhang <ji.zhang@mediatek.com> | 2018-01-26 15:04:26 +0800 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@google.com> | 2018-04-03 08:56:40 +0000 |
commit | 13b40d327b49759119e86f3e9724e27d3aa3b538 (patch) | |
tree | 709436d1b5049fc0e560be7853a3a093e7679e26 | |
parent | 40a18300721d1bf4fb2e6fcfe0fd6784ff209b1c (diff) |
arm64: fix show_data fallout from KERN_CONT changesASB-2018-04-05_4.9
The log format printed by show_data is illegible due to printk change
"commit 4bcc595ccd80decb ("printk: reinstate KERN_CONT for printing
continuation lines")".
The output is like:
[ 32.669636] SP: 0xffffffc0b01f7c50:
[ 32.669647] 7c50
[ 32.669652] b01f7eb0
[ 32.669655] ffffffc0
[ 32.669659] 00000000
[ 32.669662] 00000000
[ 32.669665] 00000015
[ 32.669669] 00000000
[ 32.669672] 00000123
[ 32.669675] 00000000
[ 32.669674]
[ 32.669680] 7c70
[ 32.669684] 0000003f
[ 32.669687] 00000000
[ 32.669690] 08c82000
[ 32.669694] ffffff80
[ 32.669697] b01f4000
[ 32.669700] ffffffc0
[ 32.669703] b01f7cd0
[ 32.669706] ffffffc0
To fix this, use pr_cont() instead of the printk() to print
continuing lines.
Signed-off-by: Ji Zhang <ji.zhang@mediatek.com>
Signed-off-by: Miles Chen <miles.chen@mediatek.com>
-rw-r--r-- | arch/arm64/kernel/process.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c index 7e365ffe1370..20a6d909f324 100644 --- a/arch/arm64/kernel/process.c +++ b/arch/arm64/kernel/process.c @@ -202,13 +202,13 @@ static void show_data(unsigned long addr, int nbytes, const char *name) for (j = 0; j < 8; j++) { u32 data; if (probe_kernel_address(p, data)) { - printk(" ********"); + pr_cont(" ********"); } else { - printk(" %08x", data); + pr_cont(" %08x", data); } ++p; } - printk("\n"); + pr_cont("\n"); } } |