From patchwork Mon May 5 20:47:42 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 29675 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yh0-f69.google.com (mail-yh0-f69.google.com [209.85.213.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 9058F202E6 for ; Mon, 5 May 2014 20:48:03 +0000 (UTC) Received: by mail-yh0-f69.google.com with SMTP id z6sf4130073yhz.0 for ; Mon, 05 May 2014 13:48: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:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=X5V5NSMobVz73RGXrzjgffjsiW9eqoLWy46Em5hnlg0=; b=Z3gH4i1z2YIg+JEVtFLAZZRFbs0knaQtQC04VpoC6BhfV/Bxd5psVKi4E5Phd17nLJ 4yT0XjSa6dhcsVFS5yab/VagSfGhg0l76R3XX3iErqWfCYGJfov13ClSaSpr/Ox9JDuw r7+bmJJAtbEFJug5/7QZMuTnpjcMaieyzVDy2MyrucYSsejSGGzPTIoewAHHZ9ztRmNB 35fielJyyFe0ngFO4VIdRAYISujcJcqR4o2HR6VFvH/3vzHPt1uWukhdULG0yx7AhBjn L3EhVQLsUWDJKaEDXflVFpjW4Z7dl3PJbyZa/6rYdjByzaRhz45LODShRIoEkuMP8skO Yp2w== X-Gm-Message-State: ALoCoQlNkDmGUWAJIMLjuLdnTHj2dKFYvNRgf9zzKYRlS02NeLhmETyQ5aST7D9jINT30gTSAbyU X-Received: by 10.236.128.195 with SMTP id f43mr16025140yhi.45.1399322883312; Mon, 05 May 2014 13:48:03 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.32.67 with SMTP id g61ls2635318qgg.12.gmail; Mon, 05 May 2014 13:48:03 -0700 (PDT) X-Received: by 10.58.69.20 with SMTP id a20mr1570994veu.63.1399322883217; Mon, 05 May 2014 13:48:03 -0700 (PDT) Received: from mail-ve0-f169.google.com (mail-ve0-f169.google.com [209.85.128.169]) by mx.google.com with ESMTPS id k19si46252vcl.95.2014.05.05.13.48.03 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 05 May 2014 13:48:03 -0700 (PDT) Received-SPF: none (google.com: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) client-ip=209.85.128.169; Received: by mail-ve0-f169.google.com with SMTP id jx11so9314543veb.14 for ; Mon, 05 May 2014 13:48:03 -0700 (PDT) X-Received: by 10.220.162.196 with SMTP id w4mr1556020vcx.58.1399322883124; Mon, 05 May 2014 13:48:03 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.221.72 with SMTP id ib8csp171019vcb; Mon, 5 May 2014 13:48:02 -0700 (PDT) X-Received: by 10.66.230.193 with SMTP id ta1mr75801103pac.29.1399322882158; Mon, 05 May 2014 13:48:02 -0700 (PDT) Received: from mail-pd0-f174.google.com (mail-pd0-f174.google.com [209.85.192.174]) by mx.google.com with ESMTPS id hi3si9723015pac.123.2014.05.05.13.48.01 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 05 May 2014 13:48:02 -0700 (PDT) Received-SPF: none (google.com: john.stultz@linaro.org does not designate permitted sender hosts) client-ip=209.85.192.174; Received: by mail-pd0-f174.google.com with SMTP id w10so7452868pde.33 for ; Mon, 05 May 2014 13:48:01 -0700 (PDT) X-Received: by 10.66.219.68 with SMTP id pm4mr75985827pac.21.1399322881590; Mon, 05 May 2014 13:48:01 -0700 (PDT) Received: from localhost.localdomain (c-67-170-153-23.hsd1.or.comcast.net. [67.170.153.23]) by mx.google.com with ESMTPSA id ck10sm79423484pac.0.2014.05.05.13.47.56 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 05 May 2014 13:47:58 -0700 (PDT) From: John Stultz To: LKML Cc: John Stultz , Jan Kara , Peter Zijlstra , Jiri Bohac , Thomas Gleixner , Ingo Molnar , Andrew Morton , Steven Rostedt Subject: [PATCH 2/4] printk: Rename printk_sched to printk_deferred Date: Mon, 5 May 2014 13:47:42 -0700 Message-Id: <1399322864-22861-3-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1399322864-22861-1-git-send-email-john.stultz@linaro.org> References: <1399322864-22861-1-git-send-email-john.stultz@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: john.stultz@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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. Cc: Jan Kara Cc: Peter Zijlstra Cc: Jiri Bohac Cc: Thomas Gleixner Cc: Ingo Molnar Cc: Andrew Morton Cc: Steven Rostedt Reviewed-by: Steven Rostedt Signed-off-by: John Stultz Reviewed-by: Jan Kara --- include/linux/printk.h | 6 +++--- kernel/printk/printk.c | 2 +- kernel/sched/core.c | 2 +- kernel/sched/deadline.c | 2 +- kernel/sched/rt.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/linux/printk.h b/include/linux/printk.h index 8752f75..7847301 100644 --- a/include/linux/printk.h +++ b/include/linux/printk.h @@ -128,9 +128,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 @@ -165,7 +165,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 57467df..7587f67 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -2584,7 +2584,7 @@ void wake_up_klogd(void) preempt_enable(); } -int printk_sched(const char *fmt, ...) +int printk_deferred(const char *fmt, ...) { va_list args; int r; diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 805b8a9..263c790 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -1336,7 +1336,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/deadline.c b/kernel/sched/deadline.c index b080957..657ed68 100644 --- a/kernel/sched/deadline.c +++ b/kernel/sched/deadline.c @@ -352,7 +352,7 @@ static void replenish_dl_entity(struct sched_dl_entity *dl_se, if (!lag_once) { lag_once = true; - printk_sched("sched: DL replenish lagged to much\n"); + printk_deferred("sched: DL replenish lagged to much\n"); } dl_se->deadline = rq_clock(rq) + pi_se->dl_deadline; dl_se->runtime = pi_se->dl_runtime; diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c index 7795e29..e7dc728 100644 --- a/kernel/sched/rt.c +++ b/kernel/sched/rt.c @@ -896,7 +896,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 { /*