From patchwork Tue Jul 22 12:13:44 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 34091 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qg0-f71.google.com (mail-qg0-f71.google.com [209.85.192.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 04F7120672 for ; Tue, 22 Jul 2014 12:17:03 +0000 (UTC) Received: by mail-qg0-f71.google.com with SMTP id f51sf17792385qge.2 for ; Tue, 22 Jul 2014 05:17:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe:content-type :content-transfer-encoding; bh=oIf/44QK8JwsDtjE8s+/07kf6iTMgYbklV4QYOv5A9E=; b=MveoZkSRvdpnLZkki6geO3l4EOXh4e9XcIKxvMDORN7bKKAzrAm2CqLxkJWzTu7w5J cgUKNKLPuuxpbSAA9mBuPUj5cv2y+5qkQn5njNHo7JF4zfX4CS5wqBicoP8QhaUAmsCo 7DU2VgDyqChO8hij4j8J+xSh9l4McwNw68SDySkIfDxQjhFJpWlON9OHehDkSLkizdAO OF0fotsj3GbQ/RoEab/EgAKOsHk3qcjeLDQkmKUuGez+AEOKdtSvUvownQDfDR47LfCQ GKEG3lfXyRnJYIFOT6f3TrzDBmMhHTPeDshT1yqPilJoIzRa+9ko+tUIvYggwRqOpvWm l1Wg== X-Gm-Message-State: ALoCoQk5v1RIGOIvg9KdRTe7+9ZFh/DqMEfNfeJ8X1c5423naIJOUDZIyKF3G77+4Rkb4b/CTEpv X-Received: by 10.236.128.112 with SMTP id e76mr13630182yhi.38.1406031423352; Tue, 22 Jul 2014 05:17:03 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.50.132.40 with SMTP id or8ls2299685igb.9.gmail; Tue, 22 Jul 2014 05:17:03 -0700 (PDT) X-Received: by 10.70.54.102 with SMTP id i6mr780992pdp.25.1406031423203; Tue, 22 Jul 2014 05:17:03 -0700 (PDT) Received: from mail-vc0-f175.google.com (mail-vc0-f175.google.com [209.85.220.175]) by mx.google.com with ESMTPS id x5si351988vei.12.2014.07.22.05.17.03 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 22 Jul 2014 05:17:03 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.175 as permitted sender) client-ip=209.85.220.175; Received: by mail-vc0-f175.google.com with SMTP id hu12so14497451vcb.34 for ; Tue, 22 Jul 2014 05:17:03 -0700 (PDT) X-Received: by 10.52.129.200 with SMTP id ny8mr3050419vdb.27.1406031423033; Tue, 22 Jul 2014 05:17:03 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.37.5 with SMTP id tc5csp190920vcb; Tue, 22 Jul 2014 05:17:02 -0700 (PDT) X-Received: by 10.66.251.233 with SMTP id zn9mr33402003pac.67.1406031421845; Tue, 22 Jul 2014 05:17:01 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id hx2si226221pbb.205.2014.07.22.05.17.01 for ; Tue, 22 Jul 2014 05:17:01 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755602AbaGVMQ7 (ORCPT + 12 others); Tue, 22 Jul 2014 08:16:59 -0400 Received: from mail-ie0-f173.google.com ([209.85.223.173]:63252 "EHLO mail-ie0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753577AbaGVMNs (ORCPT ); Tue, 22 Jul 2014 08:13:48 -0400 Received: by mail-ie0-f173.google.com with SMTP id tr6so8059377ieb.32 for ; Tue, 22 Jul 2014 05:13:47 -0700 (PDT) X-Received: by 10.50.50.198 with SMTP id e6mr15722205igo.1.1406031227509; Tue, 22 Jul 2014 05:13:47 -0700 (PDT) Received: from localhost.localdomain (c-24-245-18-91.hsd1.mn.comcast.net. [24.245.18.91]) by mx.google.com with ESMTPSA id tp4sm21112991igb.9.2014.07.22.05.13.46 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 22 Jul 2014 05:13:47 -0700 (PDT) From: Alex Elder To: akpm@linux-foundation.org Cc: kay@vrfy.org, pmladek@suse.cz, bp@suse.de, john.stultz@linaro.org, jack@suse.cz, linux-kernel@vger.kernel.org Subject: [PATCH v6 1/7] printk: report dropped messages on separate line Date: Tue, 22 Jul 2014 07:13:44 -0500 Message-Id: <1406031230-18107-2-git-send-email-elder@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1406031230-18107-1-git-send-email-elder@linaro.org> References: <1406031230-18107-1-git-send-email-elder@linaro.org> MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: elder@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.175 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , It is possible for the log to be filled too quickly for the consoles to be able to keep up. This is detected in console_unlock(), and when it occurs, a message is inserted to note the event. When reviewing some nearby code, Petr Mládek suggested it might be nicer if this message were placed on a separate line. This patch implements that suggestion. Suggested-by: Petr Mládek Signed-off-by: Alex Elder Reviewed-by: Petr Mládek --- kernel/printk/printk.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index 13e839d..ffc9928 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -2142,9 +2142,10 @@ again: } if (console_seq < log_first_seq) { - len = sprintf(text, "** %u printk messages dropped ** ", + len = sprintf(text, + "%s** %u printk messages dropped **\n", + (console_prev & LOG_CONT) ? "\n" : "", (unsigned)(log_first_seq - console_seq)); - /* messages are gone, move to first one */ console_seq = log_first_seq; console_idx = log_first_idx;