From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965227AbcJYQkd (ORCPT ); Tue, 25 Oct 2016 12:40:33 -0400 Received: from smtprelay0232.hostedemail.com ([216.40.44.232]:57352 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1757788AbcJYQkb (ORCPT ); Tue, 25 Oct 2016 12:40:31 -0400 X-Session-Marker: 6A6F6540706572636865732E636F6D X-Spam-Summary: 2,0,0,,d41d8cd98f00b204,joe@perches.com,:::::::::,RULES_HIT:41:69:355:379:541:800:960:968:973:988:989:1260:1345:1437:1534:1541:1711:1730:1747:1777:1792:2393:2559:2562:3138:3139:3140:3141:3142:3353:3865:3867:3868:4321:4419:4605:5007:6261:9592:10004:10848:11026:11658:11914:12296:12555:12679:13069:13095:13161:13229:13311:13357:14181:14384:14394:14721:21080:21433:21451:30012:30054,0,RBL:none,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fn,MSBL:0,DNSBL:none,Custom_rules:0:0:0,LFtime:1,LUA_SUMMARY:none X-HE-Tag: cars23_5b690b1d30647 X-Filterd-Recvd-Size: 2422 From: Joe Perches To: Mark Rutland , linux-kernel@vger.kernel.org Cc: Catalin Marinas , Will Deacon , linux-arm-kernel@lists.infradead.org Subject: [PATCH V2] arm64: Neaten show_regs, remove KERN_CONT Date: Tue, 25 Oct 2016 09:40:26 -0700 Message-Id: <289fb30081aba03fec0c960e7334f707bf36c881.1477413522.git.joe@perches.com> X-Mailer: git-send-email 2.10.0.rc2.1.g053435c Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org commit db4b0710fae9 ("arm64: fix show_regs fallout from KERN_CONT changes") corrected the KERN_CONT fallout from commit 4bcc595ccd80 ("printk: reinstate KERN_CONT for printing continuation lines"), but the code still has unnecessary KERN_CONT uses. Remove the KERN_CONT uses to avoid possible message interleaving. Miscellanea: o Remove unnecessary trailing blank from the output too. o Convert i and top_reg to unsigned int o Move the extra blank line after __show_reg to the caller for symmetry Signed-off-by: Joe Perches --- arch/arm64/kernel/process.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c index 01753cd7d3f0..5ba12f019bf7 100644 --- a/arch/arm64/kernel/process.c +++ b/arch/arm64/kernel/process.c @@ -168,7 +168,7 @@ void machine_restart(char *cmd) void __show_regs(struct pt_regs *regs) { - int i, top_reg; + unsigned int i, top_reg; u64 lr, sp; if (compat_user_mode(regs)) { @@ -190,24 +190,23 @@ void __show_regs(struct pt_regs *regs) i = top_reg; - while (i >= 0) { - printk("x%-2d: %016llx ", i, regs->regs[i]); + if (i % 2) { + printk("x%-2d: %016llx\n", i, regs->regs[i]); i--; - - if (i % 2 == 0) { - pr_cont("x%-2d: %016llx ", i, regs->regs[i]); - i--; - } - - pr_cont("\n"); } - printk("\n"); + while (i > 0) { + printk("x%-2d: %016llx x%-2d: %016llx\n", + i, regs->regs[i], + i - 1, regs->regs[i - 1]); + i -= 2; + } } void show_regs(struct pt_regs * regs) { printk("\n"); __show_regs(regs); + printk("\n"); } static void tls_thread_flush(void) -- 2.10.0.rc2.1.g053435c