From patchwork Wed Aug 20 11:42:40 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Slaby X-Patchwork-Id: 35689 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pa0-f71.google.com (mail-pa0-f71.google.com [209.85.220.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 090502055D for ; Wed, 20 Aug 2014 12:03:36 +0000 (UTC) Received: by mail-pa0-f71.google.com with SMTP id et14sf63647100pad.10 for ; Wed, 20 Aug 2014 05:03:31 -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: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=kB8JyWlgbXrjk+E+OuigrGxWkdGICachRqBkBbAZ3ik=; b=RE7LBbOtASmoL9yW6r8Eje8R+NXq/zJZf4XWdlTDPD51VFGa2CfFAbRTsT3rV9iS9w FNBQ6m37ypyf16sIxvSwlByPhnXETbtdRQVBFrqtJSB5w1hlW1cXNyBWEnK3GjYRMj0i dkTAS0L1JBumV2xkf7IBPgz65l0S0WS/EvG39mDMWecZn6Tn52feUmi0Y8r5+rMYda+d 3kv6dcueEDmc9VrixRyPnpSkaw3UJa7Sk+YryZ+1Kj4doisT7fYK+s/ViQyS5Xq1dQIG KcE37YsHSlMxOowoRyh2iCK7RKPowJe6m5fIKhBhNZZzN6fMDaGPuvkgQqbVwlSQbgvP d19Q== X-Gm-Message-State: ALoCoQkE9DppyT/x4yV+9GdEx/3QXRqcOjZqcKyRV59wwIeFBgc5hLwQdqlOgUXrqY16TnlL4Mcg X-Received: by 10.66.236.72 with SMTP id us8mr367974pac.43.1408536211415; Wed, 20 Aug 2014 05:03:31 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.109.246 with SMTP id l109ls239500qgf.1.gmail; Wed, 20 Aug 2014 05:03:31 -0700 (PDT) X-Received: by 10.52.97.233 with SMTP id ed9mr6865855vdb.16.1408536211279; Wed, 20 Aug 2014 05:03:31 -0700 (PDT) Received: from mail-vc0-f181.google.com (mail-vc0-f181.google.com [209.85.220.181]) by mx.google.com with ESMTPS id th4si10426350vdc.66.2014.08.20.05.03.31 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 20 Aug 2014 05:03:31 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.181 as permitted sender) client-ip=209.85.220.181; Received: by mail-vc0-f181.google.com with SMTP id lf12so8817541vcb.26 for ; Wed, 20 Aug 2014 05:03:31 -0700 (PDT) X-Received: by 10.53.3.169 with SMTP id bx9mr382352vdd.80.1408536211196; Wed, 20 Aug 2014 05:03:31 -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.45.67 with SMTP id uj3csp47672vcb; Wed, 20 Aug 2014 05:03:30 -0700 (PDT) X-Received: by 10.66.233.226 with SMTP id tz2mr52309150pac.94.1408536208446; Wed, 20 Aug 2014 05:03:28 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ug7si20763473pac.155.2014.08.20.05.03.23 for ; Wed, 20 Aug 2014 05:03:24 -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 S1753895AbaHTL7p (ORCPT + 22 others); Wed, 20 Aug 2014 07:59:45 -0400 Received: from ip4-83-240-18-248.cust.nbox.cz ([83.240.18.248]:58946 "EHLO ip4-83-240-18-248.cust.nbox.cz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752555AbaHTLoK (ORCPT ); Wed, 20 Aug 2014 07:44:10 -0400 Received: from ku by ip4-83-240-18-248.cust.nbox.cz with local (Exim 4.83) (envelope-from ) id 1XK4JD-0006pQ-Sx; Wed, 20 Aug 2014 13:44:07 +0200 From: Jiri Slaby To: stable@vger.kernel.org Cc: linux-kernel@vger.kernel.org, John Stultz , Jan Kara , Peter Zijlstra , Jiri Bohac , Thomas Gleixner , Ingo Molnar , Andrew Morton , Linus Torvalds , Jiri Slaby Subject: [PATCH 3.12 017/104] printk: rename printk_sched to printk_deferred Date: Wed, 20 Aug 2014 13:42:40 +0200 Message-Id: X-Mailer: git-send-email 2.0.4 In-Reply-To: References: In-Reply-To: References: 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: linux-kernel-owner@vger.kernel.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.181 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 3.12-stable review patch. If anyone has any objections, please let me 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 { /*