{"id":804999,"url":"http://patchwork.ozlabs.org/api/1.2/patches/804999/?format=json","web_url":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/1503496584-21970-4-git-send-email-mpe@ellerman.id.au/","project":{"id":2,"url":"http://patchwork.ozlabs.org/api/1.2/projects/2/?format=json","name":"Linux PPC development","link_name":"linuxppc-dev","list_id":"linuxppc-dev.lists.ozlabs.org","list_email":"linuxppc-dev@lists.ozlabs.org","web_url":"https://github.com/linuxppc/wiki/wiki","scm_url":"https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git","webscm_url":"https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git/","list_archive_url":"https://lore.kernel.org/linuxppc-dev/","list_archive_url_format":"https://lore.kernel.org/linuxppc-dev/{}/","commit_url_format":"https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git/commit/?id={}"},"msgid":"<1503496584-21970-4-git-send-email-mpe@ellerman.id.au>","list_archive_url":"https://lore.kernel.org/linuxppc-dev/1503496584-21970-4-git-send-email-mpe@ellerman.id.au/","date":"2017-08-23T13:56:23","name":"[4/5] powerpc/oops: Print CR/XER on same line as MSR","commit_ref":"f6fc73fb965f6c1fd7ad75aabfdee6b1af0f7093","pull_url":null,"state":"accepted","archived":false,"hash":"07474fcd111282999d1fd4c5f339cc78f8e11c80","submitter":{"id":46580,"url":"http://patchwork.ozlabs.org/api/1.2/people/46580/?format=json","name":"Michael Ellerman","email":"mpe@ellerman.id.au"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/1503496584-21970-4-git-send-email-mpe@ellerman.id.au/mbox/","series":[],"comments":"http://patchwork.ozlabs.org/api/patches/804999/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/804999/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":["patchwork-incoming@ozlabs.org","linuxppc-dev@lists.ozlabs.org"],"Delivered-To":["patchwork-incoming@ozlabs.org","linuxppc-dev@lists.ozlabs.org","linuxppc-dev@ozlabs.org"],"Received":["from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3])\n\t(using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xcpyL6nYlz9s8V\n\tfor ;\n\tThu, 24 Aug 2017 00:02:02 +1000 (AEST)","from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3])\n\tby lists.ozlabs.org (Postfix) with ESMTP id 3xcpyL5QfNzDrK4\n\tfor ;\n\tThu, 24 Aug 2017 00:02:02 +1000 (AEST)","from ozlabs.org (ozlabs.org [IPv6:2401:3900:2:1::2])\n\t(using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby lists.ozlabs.org (Postfix) with ESMTPS id 3xcpr5117vzDqh1\n\tfor ;\n\tWed, 23 Aug 2017 23:56:37 +1000 (AEST)","by ozlabs.org (Postfix)\n\tid 3xcpr474zQz9s82; Wed, 23 Aug 2017 23:56:36 +1000 (AEST)","by ozlabs.org (Postfix, from userid 1034)\n\tid 3xcpr46NXvz9s8P; Wed, 23 Aug 2017 23:56:36 +1000 (AEST)"],"From":"Michael Ellerman ","To":"linuxppc-dev@ozlabs.org","Subject":"[PATCH 4/5] powerpc/oops: Print CR/XER on same line as MSR","Date":"Wed, 23 Aug 2017 23:56:23 +1000","Message-Id":"<1503496584-21970-4-git-send-email-mpe@ellerman.id.au>","X-Mailer":"git-send-email 2.7.4","In-Reply-To":"<1503496584-21970-1-git-send-email-mpe@ellerman.id.au>","References":"<1503496584-21970-1-git-send-email-mpe@ellerman.id.au>","X-BeenThere":"linuxppc-dev@lists.ozlabs.org","X-Mailman-Version":"2.1.23","Precedence":"list","List-Id":"Linux on PowerPC Developers Mail List\n\t","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org","Sender":"\"Linuxppc-dev\"\n\t"},"content":"Somehow we missed this when the pr_cont() changes went in. Fix CR/XER\nto go on the same line as MSR, as they have historically, eg:\n\n MSR: 8000000000009032 CR: 4804408a XER: 20000000\n\nSigned-off-by: Michael Ellerman \n---\n arch/powerpc/kernel/process.c | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)","diff":"diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c\nindex 34bd94b090e2..91f9819cb51b 100644\n--- a/arch/powerpc/kernel/process.c\n+++ b/arch/powerpc/kernel/process.c\n@@ -1386,7 +1386,7 @@ void show_regs(struct pt_regs * regs)\n \t regs, regs->trap, print_tainted(), init_utsname()->release);\n \tprintk(\"MSR: \"REG\" \", regs->msr);\n \tprint_msr_bits(regs->msr);\n-\tprintk(\" CR: %08lx XER: %08lx\\n\", regs->ccr, regs->xer);\n+\tpr_cont(\" CR: %08lx XER: %08lx\\n\", regs->ccr, regs->xer);\n \ttrap = TRAP(regs);\n \tif ((regs->trap != 0xc00) && cpu_has_feature(CPU_FTR_CFAR))\n \t\tpr_cont(\"CFAR: \"REG\" \", regs->orig_gpr3);\n","prefixes":["4/5"]}