Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Tue, 26 Jun 2018 03:25:01 -0700
From:   tip-bot for Dmitry Vyukov <tipbot@zytor.com>
Message-ID: <tip-4188f063e3694ccbf2a2044cf17cc325f91e458f@git.kernel.org>
Cc:     tglx@linutronix.de, linux-kernel@vger.kernel.org,
        sergey.senozhatsky@gmail.com, brgerst@gmail.com,
        peterz@infradead.org, hpa@zytor.com, luto@kernel.org,
        dvyukov@google.com, mingo@kernel.org,
        torvalds@linux-foundation.org, jpoimboe@redhat.com,
        dvlasenk@redhat.com, bp@alien8.de
Reply-To: jpoimboe@redhat.com, bp@alien8.de, dvlasenk@redhat.com,
          mingo@kernel.org, dvyukov@google.com, luto@kernel.org,
          torvalds@linux-foundation.org, linux-kernel@vger.kernel.org,
          tglx@linutronix.de, peterz@infradead.org, brgerst@gmail.com,
          hpa@zytor.com, sergey.senozhatsky@gmail.com
In-Reply-To: <20180625123808.227417-1-dvyukov@gmail.com>
References: <20180625123808.227417-1-dvyukov@gmail.com>
To:     linux-tip-commits@vger.kernel.org
Subject: [tip:x86/urgent] x86/mm: Get rid of KERN_CONT in show_fault_oops()
Git-Commit-ID: 4188f063e3694ccbf2a2044cf17cc325f91e458f
Robot-ID: <tip-bot.git.kernel.org>
Robot-Unsubscribe: Contact <mailto:hpa@kernel.org> to get blacklisted from
 these emails
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset=UTF-8
Content-Disposition: inline
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Commit-ID:  4188f063e3694ccbf2a2044cf17cc325f91e458f
Gitweb:     https://git.kernel.org/tip/4188f063e3694ccbf2a2044cf17cc325f91e458f
Author:     Dmitry Vyukov <dvyukov@google.com>
AuthorDate: Mon, 25 Jun 2018 14:38:08 +0200
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Tue, 26 Jun 2018 09:00:25 +0200

x86/mm: Get rid of KERN_CONT in show_fault_oops()

KERN_CONT leads to split lines in kernel output
and complicates useful changes to printk like
printing context before each line.

Only acceptable use of continuations is basically
boot-time testing.

Get rid of it.

Signed-off-by: Dmitry Vyukov <dvyukov@google.com>
Reviewed-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/20180625123808.227417-1-dvyukov@gmail.com
[ Removed unnecessary parentheses and prettified the printk statement. ]
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 arch/x86/mm/fault.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
index 9a84a0d08727..ee85766e6329 100644
--- a/arch/x86/mm/fault.c
+++ b/arch/x86/mm/fault.c
@@ -671,13 +671,9 @@ show_fault_oops(struct pt_regs *regs, unsigned long error_code,
 			printk(smep_warning, from_kuid(&init_user_ns, current_uid()));
 	}
 
-	printk(KERN_ALERT "BUG: unable to handle kernel ");
-	if (address < PAGE_SIZE)
-		printk(KERN_CONT "NULL pointer dereference");
-	else
-		printk(KERN_CONT "paging request");
-
-	printk(KERN_CONT " at %px\n", (void *) address);
+	pr_alert("BUG: unable to handle kernel %s at %px\n",
+		 address < PAGE_SIZE ? "NULL pointer dereference" : "paging request",
+		 (void *)address);
 
 	dump_pagetable(address);
 }