From patchwork Tue Dec 11 12:11:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin LABBE X-Patchwork-Id: 1011083 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=sparclinux-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=baylibre-com.20150623.gappssmtp.com header.i=@baylibre-com.20150623.gappssmtp.com header.b="sHuOXMkI"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43Df1L09H3z9s3l for ; Tue, 11 Dec 2018 23:11:17 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726278AbeLKMLQ (ORCPT ); Tue, 11 Dec 2018 07:11:16 -0500 Received: from mail-wr1-f67.google.com ([209.85.221.67]:40330 "EHLO mail-wr1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726114AbeLKMLQ (ORCPT ); Tue, 11 Dec 2018 07:11:16 -0500 Received: by mail-wr1-f67.google.com with SMTP id p4so13819692wrt.7 for ; Tue, 11 Dec 2018 04:11:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=aMzDWZ5d4DsmLZNz4JpMbix0QWStbli61BCRMNkvIn8=; b=sHuOXMkIijV+0GoFjy5UiUhcyBUNL0DPDkE10nnUjD4g1hnSC1HVVUlSXnce04RaBJ uGIluta8QRMR4AI7AzHi06fRAWzwznKc5ynojJ8NQ+bE62cfUySIidBMzGbngY5WgNmR 3tDlONSQaH1sp6opyfoAZvXiOvGiHH6efUP4JhHnxdEZKcnW8ZWrwavivRzRSKbBlxKw e1FDUZ77SKOR1tCFxfewVQSCgtDwhgtXc0O2I1doUZYxM6gdea/zEnaKccwNY97OQUo+ VueGYPZB2tQDCVxEL03YRJPPWD7LtxUoDOmh0J1juCXZ+iRr8GCBxm+s+eAa1yHXtuLn 3Krw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=aMzDWZ5d4DsmLZNz4JpMbix0QWStbli61BCRMNkvIn8=; b=rGcl1x/vx9NBYi3XLnK6bx7EgNg0ElZh50uPdpg8AgO9fG4B/5XK9uJvJAezqu0vw1 vBrusRFRpTb3DUKwvdW7U73T8vW/TGHcDP/ORg7orK836taTX03P83VyIbANheHlgLWV fzhH8fqyVrznc+C56om1D2wLpdp7xLiLN1FzmNjAtGiniu1cjZau3/dAfLxZb63YX9Os Igwt/kFxD8kj/KImAcXgUqmUuTwRIJ44kkYuaUQz6wna9B6Myu0VhG+V73EyRjeuDA0p j2sERnpGMBBzrY7Zih5xAuZPALRDNJygSBjngssjQVad/m+3EBH+0V4QV1c0+UlN72tT 5IUg== X-Gm-Message-State: AA+aEWaO73Yg+OGTVcE1d3qmFObMMyrWfNr27c+yKjHyww/Ht41IEeEw zEgYK+D/DttxWmqMBkYtxlKY1A== X-Google-Smtp-Source: AFSGD/UbKywRizAEeEdkNhUkyhmMvOvNduFHnwgON+ZPGJGhZvILWUTmi64Y7sLghhD9YzgXo+7WCQ== X-Received: by 2002:a05:6000:8a:: with SMTP id m10mr12734890wrx.79.1544530274710; Tue, 11 Dec 2018 04:11:14 -0800 (PST) Received: from localhost.localdomain ([51.15.160.169]) by smtp.googlemail.com with ESMTPSA id p14sm9999629wrt.37.2018.12.11.04.11.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 11 Dec 2018 04:11:14 -0800 (PST) From: Corentin Labbe To: davem@davemloft.net Cc: linux-kernel@vger.kernel.org, sparclinux@vger.kernel.org, Corentin Labbe Subject: [PATCH] sparc: Set "ARCH: sunxx" information on the same line Date: Tue, 11 Dec 2018 12:11:09 +0000 Message-Id: <1544530269-15008-1-git-send-email-clabbe@baylibre.com> X-Mailer: git-send-email 2.7.4 Sender: sparclinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: sparclinux@vger.kernel.org While checking boot log from SPARC qemu, I saw that the "ARCH: sunxx" information was split on two different line. This patchs merge both line together. In the meantime, thoses information need to be printed via pr_info since printk print them by default via the warning loglevel. Signed-off-by: Corentin Labbe --- arch/sparc/kernel/setup_32.c | 13 ++++++------- arch/sparc/kernel/setup_64.c | 4 ++-- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/arch/sparc/kernel/setup_32.c b/arch/sparc/kernel/setup_32.c index 7df3d704284c..afe1592a6d08 100644 --- a/arch/sparc/kernel/setup_32.c +++ b/arch/sparc/kernel/setup_32.c @@ -311,25 +311,24 @@ void __init setup_arch(char **cmdline_p) register_console(&prom_early_console); - printk("ARCH: "); switch(sparc_cpu_model) { case sun4m: - printk("SUN4M\n"); + pr_info("ARCH: SUN4M\n"); break; case sun4d: - printk("SUN4D\n"); + pr_info("ARCH: SUN4D\n"); break; case sun4e: - printk("SUN4E\n"); + pr_info("ARCH: SUN4E\n"); break; case sun4u: - printk("SUN4U\n"); + pr_info("ARCH: SUN4U\n"); break; case sparc_leon: - printk("LEON\n"); + pr_info("ARCH: LEON\n"); break; default: - printk("UNKNOWN!\n"); + pr_info("ARCH: UNKNOWN!\n"); break; } diff --git a/arch/sparc/kernel/setup_64.c b/arch/sparc/kernel/setup_64.c index 014390950333..51c4d12c0853 100644 --- a/arch/sparc/kernel/setup_64.c +++ b/arch/sparc/kernel/setup_64.c @@ -643,9 +643,9 @@ void __init setup_arch(char **cmdline_p) register_console(&prom_early_console); if (tlb_type == hypervisor) - printk("ARCH: SUN4V\n"); + pr_info("ARCH: SUN4V\n"); else - printk("ARCH: SUN4U\n"); + pr_info("ARCH: SUN4U\n"); #ifdef CONFIG_DUMMY_CONSOLE conswitchp = &dummy_con;