From patchwork Thu Jun 4 18:36:47 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Perches X-Patchwork-Id: 6549081 Return-Path: X-Original-To: patchwork-linux-pm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 9F6439F326 for ; Thu, 4 Jun 2015 18:42:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4945920798 for ; Thu, 4 Jun 2015 18:42:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3B4932074A for ; Thu, 4 Jun 2015 18:42:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752650AbbFDSm0 (ORCPT ); Thu, 4 Jun 2015 14:42:26 -0400 Received: from smtprelay0141.hostedemail.com ([216.40.44.141]:50027 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751672AbbFDSmZ (ORCPT ); Thu, 4 Jun 2015 14:42:25 -0400 X-Greylist: delayed 328 seconds by postgrey-1.27 at vger.kernel.org; Thu, 04 Jun 2015 14:42:25 EDT Received: from smtprelay.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by smtpgrave07.hostedemail.com (Postfix) with ESMTP id 611E911B95B for ; Thu, 4 Jun 2015 18:37:07 +0000 (UTC) Received: from filter.hostedemail.com (unknown [216.40.38.60]) by smtprelay08.hostedemail.com (Postfix) with ESMTP id A02AB29DD79; Thu, 4 Jun 2015 18:37:05 +0000 (UTC) X-Session-Marker: 6A6F6540706572636865732E636F6D X-Spam-Summary: 2, 0, 0, , d41d8cd98f00b204, joe@perches.com, :::::::::, RULES_HIT:41:355:379:541:800:960:973:988:989:1260:1345:1359:1534:1541:1711:1730:1747:1777:1792:2393:2559:2562:3138:3139:3140:3141:3142:3352:3865:3874:4321:5007:6261:10004:10848:11026:11658:11914:12043:12048:12294:12438:12517:12519:12555:12663:13311:13357:14093:14394:21080, 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 X-HE-Tag: waves66_382a84972e03 X-Filterd-Recvd-Size: 2111 Received: from joe-laptop.perches.com (pool-173-51-221-2.lsanca.fios.verizon.net [173.51.221.2]) (Authenticated sender: joe@perches.com) by omf07.hostedemail.com (Postfix) with ESMTPA; Thu, 4 Jun 2015 18:37:04 +0000 (UTC) From: Joe Perches To: linux-pm@vger.kernel.org, "Rafael J. Wysocki" , Len Brown , Pavel Machek Cc: linux-kernel@vger.kernel.org Subject: [PATCH 4/6] power: swap: Standardize "Image " messages Date: Thu, 4 Jun 2015 11:36:47 -0700 Message-Id: <21562844eb3bcbce4b7619098a69d0c342b879a3.1433442778.git.joe@perches.com> X-Mailer: git-send-email 2.1.2 In-Reply-To: References: Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Standardize "Image <...>" messages Always emit the "Image " messages on 2 separate lines so that these messages can't be interleaved. Signed-off-by: Joe Perches --- kernel/power/swap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kernel/power/swap.c b/kernel/power/swap.c index 2f30ca9..7aa2635 100644 --- a/kernel/power/swap.c +++ b/kernel/power/swap.c @@ -552,7 +552,7 @@ static int save_image(struct swap_map_handle *handle, if (!ret) ret = err2; if (!ret) - printk(KERN_INFO "PM: Image saving done.\n"); + printk(KERN_INFO "PM: Image saving: done\n"); swsusp_show_speed(start, stop, nr_to_write, "Wrote"); return ret; } @@ -843,7 +843,7 @@ out_finish: if (!ret) ret = err2; if (!ret) - printk(KERN_INFO "PM: Image saving done.\n"); + printk(KERN_INFO "PM: Image saving: done\n"); swsusp_show_speed(start, stop, nr_to_write, "Wrote"); out_clean: if (crc) { @@ -1081,7 +1081,7 @@ static int load_image(struct swap_map_handle *handle, if (!ret) ret = err2; if (!ret) { - printk(KERN_INFO "PM: Image loading done.\n"); + printk(KERN_INFO "PM: Image loading: done\n"); snapshot_write_finalize(snapshot); if (!snapshot_image_loaded(snapshot)) ret = -ENODATA;