From patchwork Thu Jul 10 13:01:21 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 33422 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yh0-f72.google.com (mail-yh0-f72.google.com [209.85.213.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id EB5C6203C0 for ; Thu, 10 Jul 2014 13:02:09 +0000 (UTC) Received: by mail-yh0-f72.google.com with SMTP id f10sf35494256yha.3 for ; Thu, 10 Jul 2014 06:02:09 -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=vyJ5MfFVH1yaYJh3TVcJ7l6Kgh5JtQK7I6LXw8D9adg=; b=clBsm9goiIzO0oPGlgCVuzkxwSKgr3nIKn70ObZAwBie23RFMvFhGccJ2KxQV0juH/ kZxOHCD+7kgkdEOTWa6SkeqTYGCFsgALOvKheeCHTdOMhBKuBqc0zTrOIIwVD1IklqWY WGv0b9qVOzSuDnRV5VsrRdJGhrgOMDvV83by+lsX/q0Pn8YyugUUCQRZ9gFWQEoCJXYA coeFiJgn30gUdh3ryXVQGAC464Q45yQALtg9uXFkt65bmus2L8XM1yCo+3UcVK2oMMsK HHOQSZcBUJM716YqjJuuCzIhbpQjN0RN/lCIeO6Wyv6dt1542kFLu27p+tsIU2REcgPG E7wA== X-Gm-Message-State: ALoCoQmARryJekx3BNcuzRV1xrDrzvpxuWYj+P7WPbIDcpO1XfIE/bRHHbpxi+ZKdoWebGCwNfW6 X-Received: by 10.58.219.105 with SMTP id pn9mr23350632vec.30.1404997329667; Thu, 10 Jul 2014 06:02:09 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.82.168 with SMTP id h37ls55933qgd.62.gmail; Thu, 10 Jul 2014 06:02:09 -0700 (PDT) X-Received: by 10.52.120.83 with SMTP id la19mr141732vdb.68.1404997329584; Thu, 10 Jul 2014 06:02:09 -0700 (PDT) Received: from mail-vc0-f172.google.com (mail-vc0-f172.google.com [209.85.220.172]) by mx.google.com with ESMTPS id yj4si4786279vec.80.2014.07.10.06.02.09 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 10 Jul 2014 06:02:09 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.172 as permitted sender) client-ip=209.85.220.172; Received: by mail-vc0-f172.google.com with SMTP id hy10so10381656vcb.17 for ; Thu, 10 Jul 2014 06:02:09 -0700 (PDT) X-Received: by 10.52.163.229 with SMTP id yl5mr33396vdb.79.1404997329479; Thu, 10 Jul 2014 06:02:09 -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 tc5csp130835vcb; Thu, 10 Jul 2014 06:02:09 -0700 (PDT) X-Received: by 10.70.43.227 with SMTP id z3mr17051695pdl.77.1404997328477; Thu, 10 Jul 2014 06:02:08 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id pe9si28739501pac.40.2014.07.10.06.02.07; Thu, 10 Jul 2014 06:02:07 -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 S1753648AbaGJNB7 (ORCPT + 28 others); Thu, 10 Jul 2014 09:01:59 -0400 Received: from mail-ie0-f180.google.com ([209.85.223.180]:38230 "EHLO mail-ie0-f180.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753436AbaGJNB0 (ORCPT ); Thu, 10 Jul 2014 09:01:26 -0400 Received: by mail-ie0-f180.google.com with SMTP id at20so920463iec.39 for ; Thu, 10 Jul 2014 06:01:26 -0700 (PDT) X-Received: by 10.50.77.48 with SMTP id p16mr21273870igw.41.1404997285991; Thu, 10 Jul 2014 06:01:25 -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 d4sm24960026igc.5.2014.07.10.06.01.24 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 10 Jul 2014 06:01:25 -0700 (PDT) From: Alex Elder To: akpm@linux-foundation.org Cc: ak@linux.intel.com, bp@suse.de, jack@suse.cz, john.stultz@linaro.org, pmladek@suse.cz, rostedt@goodmis.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/4] printk: rename DEFAULT_MESSAGE_LOGLEVEL Date: Thu, 10 Jul 2014 08:01:21 -0500 Message-Id: <1404997284-20844-2-git-send-email-elder@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1404997284-20844-1-git-send-email-elder@linaro.org> References: <1404997284-20844-1-git-send-email-elder@linaro.org> 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.172 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: , This commit: a8fe19eb kernel/printk: use symbolic defines for console loglevels makes consistent use of symbolic values for printk() log levels. The naming scheme used is different from the one used for DEFAULT_MESSAGE_LOGLEVEL though. Change that symbol name to be MESSAGE_LOGLEVEL_DEFAULT for consistency. And because the value of that symbol comes from a similarly-named config option, rename CONFIG_DEFAULT_MESSAGE_LOGLEVEL as well. Signed-off-by: Alex Elder --- include/linux/printk.h | 2 +- kernel/printk/printk.c | 2 +- lib/Kconfig.debug | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/linux/printk.h b/include/linux/printk.h index 319ff7e..0990997 100644 --- a/include/linux/printk.h +++ b/include/linux/printk.h @@ -31,7 +31,7 @@ static inline const char *printk_skip_level(const char *buffer) } /* printk's without a loglevel use this.. */ -#define DEFAULT_MESSAGE_LOGLEVEL CONFIG_DEFAULT_MESSAGE_LOGLEVEL +#define MESSAGE_LOGLEVEL_DEFAULT CONFIG_MESSAGE_LOGLEVEL_DEFAULT /* We show everything that is MORE important than this.. */ #define CONSOLE_LOGLEVEL_SILENT 0 /* Mum's the word */ diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index 13e839d..ac2b64e 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -56,7 +56,7 @@ int console_printk[4] = { CONSOLE_LOGLEVEL_DEFAULT, /* console_loglevel */ - DEFAULT_MESSAGE_LOGLEVEL, /* default_message_loglevel */ + MESSAGE_LOGLEVEL_DEFAULT, /* default_message_loglevel */ CONSOLE_LOGLEVEL_MIN, /* minimum_console_loglevel */ CONSOLE_LOGLEVEL_DEFAULT, /* default_console_loglevel */ }; diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index 7a638aa..fd939e1 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug @@ -15,7 +15,7 @@ config PRINTK_TIME The behavior is also controlled by the kernel command line parameter printk.time=1. See Documentation/kernel-parameters.txt -config DEFAULT_MESSAGE_LOGLEVEL +config MESSAGE_LOGLEVEL_DEFAULT int "Default message log level (1-7)" range 1 7 default "4"