Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Thumshirn <jthumshirn@suse.de>2018-01-12 16:50:03 +0100
committerJohannes Thumshirn <jthumshirn@suse.de>2018-01-12 16:50:03 +0100
commit588da4b74822d697b1c790822aeb209c23d985e8 (patch)
treebcf26af909eb05b59e2b5744338249c53b9f0689
parentaa6f28e2859c9945b3651d4fa2107389d11dce63 (diff)
s390/disassembler: correct disassembly lines alignment
(bnc#1072915, LTC#161577).
-rw-r--r--patches.arch/s390-disassembler-correct-disassembly-lines-alignmen.patch39
-rw-r--r--series.conf1
2 files changed, 40 insertions, 0 deletions
diff --git a/patches.arch/s390-disassembler-correct-disassembly-lines-alignmen.patch b/patches.arch/s390-disassembler-correct-disassembly-lines-alignmen.patch
new file mode 100644
index 0000000000..9c0aaf5d3d
--- /dev/null
+++ b/patches.arch/s390-disassembler-correct-disassembly-lines-alignmen.patch
@@ -0,0 +1,39 @@
+From: Vasily Gorbik <gor@linux.vnet.ibm.com>
+Date: Thu, 23 Nov 2017 10:50:23 +0100
+Subject: s390/disassembler: correct disassembly lines alignment
+Patch-mainline: v4.15-rc2
+Git-commit: 26f4e759ef9b8a2bab1823d692ed6d56d40b66e3
+References: bnc#1072915, LTC#161577
+
+176.718956 Krnl Code: 00000000004d38b0: a54c0018 llihh %r4,24
+176.718956 00000000004d38b4: b9080014 agr %r1,%r4
+ ^
+Using a tab to align disassembly lines which follow the first line with
+"Krnl Code: " doesn't always work, e.g. if there is a prefix (timestamp
+or syslog prefix) which is not 8 chars aligned. Go back to alignment
+with spaces.
+
+Fixes: b192571d1ae3 ("s390/disassembler: increase show_code buffer size")
+Signed-off-by: Vasily Gorbik <gor@linux.vnet.ibm.com>
+Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
+Acked-by: Johannes Thumshirn <jthumshirn@suse.de>
+---
+ arch/s390/kernel/dis.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/arch/s390/kernel/dis.c b/arch/s390/kernel/dis.c
+index 465d52b5e470..0a0e14335a04 100644
+--- a/arch/s390/kernel/dis.c
++++ b/arch/s390/kernel/dis.c
+@@ -548,7 +548,7 @@ void show_code(struct pt_regs *regs)
+ start += opsize;
+ pr_cont("%s", buffer);
+ ptr = buffer;
+- ptr += sprintf(ptr, "\n\t ");
++ ptr += sprintf(ptr, "\n ");
+ hops++;
+ }
+ pr_cont("\n");
+--
+2.12.3
+
diff --git a/series.conf b/series.conf
index 66e4033615..40ad9c5503 100644
--- a/series.conf
+++ b/series.conf
@@ -6335,6 +6335,7 @@
patches.fixes/mm-fail-get_vaddr_frames-for-filesystem-dax-mappings.patch
patches.fixes/v4l2-disable-filesystem-dax-mapping-support.patch
patches.fixes/IB-core-disable-memory-registration-of-filesystem-da.patch
+ patches.arch/s390-disassembler-correct-disassembly-lines-alignmen.patch
patches.drivers/nvme-fabrics-introduce-init-command-check-for-a-queu.patch
patches.drivers/nvme-fc-check-if-queue-is-ready-in-queue_rq.patch
patches.drivers/nvme-loop-check-if-queue-is-ready-in-queue_rq.patch