From patchwork Tue Aug 19 12:32:20 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Slaby X-Patchwork-Id: 35587 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f69.google.com (mail-oa0-f69.google.com [209.85.219.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 7A42721457 for ; Tue, 19 Aug 2014 12:33:40 +0000 (UTC) Received: by mail-oa0-f69.google.com with SMTP id i7sf43379289oag.4 for ; Tue, 19 Aug 2014 05:33:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=f/bCGZyXcQtd6rwUukrln+I258P/YgJzaqRi+Ui0/LY=; b=laJG1O9MRnEXy9BAb5FL6upSMxKSqPA+XvnS9ZcE6AxYoD0xWldxWjh+N7oAwrlzgb MOnlGImzy3LwnTc0Y8/qGfD5y3aGvmj6nQxP8XzXQB65t6ijo3h0v7hMgtV3Sb0n5kLo jIcNF+lrdOLCcWIxxvsSntrkIZ6hw8bVuV2kF/oGydGQEcilKM+BE/OmAJsG76tFu0G3 jVCJuFRpWzOK5QsKti7MnEJeFkOQqSVgGWR16kGOvqaS3wIhjyWqKaaJjUcsdSP5T5xW AHQTtxZ4F6NOsalSSe6u4UCyplQqJJaYce9MgGIPElE60Cn5PrZ9g2TeCzw0NJi7eVOd fZ9w== X-Gm-Message-State: ALoCoQlKmmPM0UQ3BvLp31uxoVKJfSVgOq1D17cTnM6dAKhOS8iGBiawxHWZE6eNMv2ng8ejr6cd X-Received: by 10.50.136.194 with SMTP id qc2mr573538igb.7.1408451620110; Tue, 19 Aug 2014 05:33:40 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.46.100 with SMTP id j91ls122862qga.44.gmail; Tue, 19 Aug 2014 05:33:40 -0700 (PDT) X-Received: by 10.52.88.74 with SMTP id be10mr166669vdb.54.1408451620033; Tue, 19 Aug 2014 05:33:40 -0700 (PDT) Received: from mail-vc0-f182.google.com (mail-vc0-f182.google.com [209.85.220.182]) by mx.google.com with ESMTPS id wt5si6801590vcb.61.2014.08.19.05.33.40 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 19 Aug 2014 05:33:40 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.182 as permitted sender) client-ip=209.85.220.182; Received: by mail-vc0-f182.google.com with SMTP id hy4so7336683vcb.13 for ; Tue, 19 Aug 2014 05:33:40 -0700 (PDT) X-Received: by 10.52.249.66 with SMTP id ys2mr928667vdc.41.1408451619923; Tue, 19 Aug 2014 05:33:39 -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 tc5csp234792vcb; Tue, 19 Aug 2014 05:33:39 -0700 (PDT) X-Received: by 10.70.41.11 with SMTP id b11mr1474286pdl.11.1408451618434; Tue, 19 Aug 2014 05:33:38 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h12si26675709pat.203.2014.08.19.05.33.29 for ; Tue, 19 Aug 2014 05:33:30 -0700 (PDT) Received-SPF: none (google.com: stable-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 S1753050AbaHSMcl (ORCPT + 1 other); Tue, 19 Aug 2014 08:32:41 -0400 Received: from ip4-83-240-18-248.cust.nbox.cz ([83.240.18.248]:56031 "EHLO ip4-83-240-18-248.cust.nbox.cz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753054AbaHSMci (ORCPT ); Tue, 19 Aug 2014 08:32:38 -0400 Received: from ku by ip4-83-240-18-248.cust.nbox.cz with local (Exim 4.83) (envelope-from ) id 1XJiaY-0003mc-8Y; Tue, 19 Aug 2014 14:32:34 +0200 From: Jiri Slaby To: stable@vger.kernel.org Cc: John Stultz , Jan Kara , Peter Zijlstra , Jiri Bohac , Thomas Gleixner , Ingo Molnar , Andrew Morton , Linus Torvalds , Jiri Slaby Subject: [patch added to the 3.12 stable tree] printk: rename printk_sched to printk_deferred Date: Tue, 19 Aug 2014 14:32:20 +0200 Message-Id: <1408451554-14422-16-git-send-email-jslaby@suse.cz> X-Mailer: git-send-email 2.0.4 In-Reply-To: <1408451554-14422-1-git-send-email-jslaby@suse.cz> References: <1408451554-14422-1-git-send-email-jslaby@suse.cz> Sender: stable-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: stable@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: patch@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.182 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: , From: John Stultz This patch has been added to the 3.12 stable tree. If you have any objections, please let us know. =============== commit aac74dc495456412c4130a1167ce4beb6c1f0b38 upstream. After learning we'll need some sort of deferred printk functionality in the timekeeping core, Peter suggested we rename the printk_sched function so it can be reused by needed subsystems. This only changes the function name. No logic changes. Signed-off-by: John Stultz Reviewed-by: Steven Rostedt Cc: Jan Kara Cc: Peter Zijlstra Cc: Jiri Bohac Cc: Thomas Gleixner Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Jiri Slaby --- include/linux/printk.h | 6 +++--- kernel/printk/printk.c | 2 +- kernel/sched/core.c | 2 +- kernel/sched/rt.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/linux/printk.h b/include/linux/printk.h index 694925837a16..1864d94d1a89 100644 --- a/include/linux/printk.h +++ b/include/linux/printk.h @@ -124,9 +124,9 @@ asmlinkage __printf(1, 2) __cold int printk(const char *fmt, ...); /* - * Special printk facility for scheduler use only, _DO_NOT_USE_ ! + * Special printk facility for scheduler/timekeeping use only, _DO_NOT_USE_ ! */ -__printf(1, 2) __cold int printk_sched(const char *fmt, ...); +__printf(1, 2) __cold int printk_deferred(const char *fmt, ...); /* * Please don't use printk_ratelimit(), because it shares ratelimiting state @@ -161,7 +161,7 @@ int printk(const char *s, ...) return 0; } static inline __printf(1, 2) __cold -int printk_sched(const char *s, ...) +int printk_deferred(const char *s, ...) { return 0; } diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index c59896c65ac3..0f9149036885 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -2470,7 +2470,7 @@ void wake_up_klogd(void) preempt_enable(); } -int printk_sched(const char *fmt, ...) +int printk_deferred(const char *fmt, ...) { unsigned long flags; va_list args; diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 07039cba59d9..f09e22163be3 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -1224,7 +1224,7 @@ out: * leave kernel. */ if (p->mm && printk_ratelimit()) { - printk_sched("process %d (%s) no longer affine to cpu%d\n", + printk_deferred("process %d (%s) no longer affine to cpu%d\n", task_pid_nr(p), p->comm, cpu); } } diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c index ff04e1a06412..e849d4070c7f 100644 --- a/kernel/sched/rt.c +++ b/kernel/sched/rt.c @@ -829,7 +829,7 @@ static int sched_rt_runtime_exceeded(struct rt_rq *rt_rq) if (!once) { once = true; - printk_sched("sched: RT throttling activated\n"); + printk_deferred("sched: RT throttling activated\n"); } } else { /*