From patchwork Wed Jul 9 13:04:14 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 33310 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vc0-f199.google.com (mail-vc0-f199.google.com [209.85.220.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 4F9E1208CF for ; Wed, 9 Jul 2014 13:05:01 +0000 (UTC) Received: by mail-vc0-f199.google.com with SMTP id ij19sf24348259vcb.6 for ; Wed, 09 Jul 2014 06:05:01 -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=kxntM7HHr8rXnrcqVFIvT3J9O3Z91OWepZz+M/qd/bE=; b=Vcgx57a2EtawJPexAsQ6vuwhhI23wuuARYG3x7zVrI8e17ZT91F+yylZyAmFajzy0z qK7lLac9n4w9LpXSXRLt8+vGvAGLoZfYpznuLtD4SF1lR1l5dMgVkxsz5sb/IEIUOXmi RxtPUZJzlETC+jPg01MUU3Od7TUAhl1mmXMDVtapPMljE8DJXLB2Yph+OvqNPRHaivip W9b5Mb5UPKpkVcCcz7IqAkks6tmha0o4iYLy/ARds4RDcBkKp71wdfu8WzvxX9DrZG4l WkNGoSbNEoO1zQR0TkapMu0Zn8Z4SVPiEMhdvrTApaIr2ufgXZD0gUi738GhB8Yx5tFe GM3Q== X-Gm-Message-State: ALoCoQk+N76t6lDJ7tdHKimJ+jAF49e0zRK5667wibji1+gL9DHawKip8Qo7Dumkz4antMOZQTjK X-Received: by 10.236.29.37 with SMTP id h25mr17195398yha.8.1404911101626; Wed, 09 Jul 2014 06:05:01 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.109.162 with SMTP id l31ls99670qgf.83.gmail; Wed, 09 Jul 2014 06:05:01 -0700 (PDT) X-Received: by 10.220.17.199 with SMTP id t7mr39896819vca.1.1404911101525; Wed, 09 Jul 2014 06:05:01 -0700 (PDT) Received: from mail-ve0-f179.google.com (mail-ve0-f179.google.com [209.85.128.179]) by mx.google.com with ESMTPS id iq6si21456735vcb.100.2014.07.09.06.05.01 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 09 Jul 2014 06:05:01 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.179 as permitted sender) client-ip=209.85.128.179; Received: by mail-ve0-f179.google.com with SMTP id jz11so859875veb.38 for ; Wed, 09 Jul 2014 06:05:01 -0700 (PDT) X-Received: by 10.220.15.8 with SMTP id i8mr282297vca.45.1404911101400; Wed, 09 Jul 2014 06:05:01 -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 tc5csp46085vcb; Wed, 9 Jul 2014 06:05:00 -0700 (PDT) X-Received: by 10.66.121.168 with SMTP id ll8mr41449243pab.86.1404911098924; Wed, 09 Jul 2014 06:04:58 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p10si7317985pds.252.2014.07.09.06.04.58; Wed, 09 Jul 2014 06:04:58 -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 S1756020AbaGINEV (ORCPT + 28 others); Wed, 9 Jul 2014 09:04:21 -0400 Received: from mail-ig0-f173.google.com ([209.85.213.173]:52813 "EHLO mail-ig0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755566AbaGINET (ORCPT ); Wed, 9 Jul 2014 09:04:19 -0400 Received: by mail-ig0-f173.google.com with SMTP id h18so652521igc.0 for ; Wed, 09 Jul 2014 06:04:18 -0700 (PDT) X-Received: by 10.50.25.130 with SMTP id c2mr12797324igg.7.1404911058633; Wed, 09 Jul 2014 06:04:18 -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 lo3sm15293753igb.22.2014.07.09.06.04.17 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 09 Jul 2014 06:04:18 -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 2/4] printk: fix some comments Date: Wed, 9 Jul 2014 08:04:14 -0500 Message-Id: <1404911056-29064-3-git-send-email-elder@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1404911056-29064-1-git-send-email-elder@linaro.org> References: <1404911056-29064-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.128.179 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 patch fixes a few comments that don't accurately describe their corresponding code. It also fixes some minor typographical errors. Signed-off-by: Alex Elder Reviewed-by: Petr Mladek --- kernel/printk/printk.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index ac2b64e..646146c 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -113,9 +113,9 @@ static int __down_trylock_console_sem(unsigned long ip) * This is used for debugging the mess that is the VT code by * keeping track if we have the console semaphore held. It's * definitely not the perfect debug tool (we don't know if _WE_ - * hold it are racing, but it helps tracking those weird code - * path in the console code where we end up in places I want - * locked without the console sempahore held + * hold it and are racing, but it helps tracking those weird code + * paths in the console code where we end up in places I want + * locked without the console sempahore held). */ static int console_locked, console_suspended; @@ -146,8 +146,8 @@ static int console_may_schedule; * the overall length of the record. * * The heads to the first and last entry in the buffer, as well as the - * sequence numbers of these both entries are maintained when messages - * are stored.. + * sequence numbers of these entries are maintained when messages are + * stored. * * If the heads indicate available messages, the length in the header * tells the start next message. A length == 0 for the next message @@ -344,7 +344,7 @@ static int log_make_free_space(u32 msg_size) while (log_first_seq < log_next_seq) { if (logbuf_has_space(msg_size, false)) return 0; - /* drop old messages until we have enough continuous space */ + /* drop old messages until we have enough contiguous space */ log_first_idx = log_next(log_first_idx); log_first_seq++; } @@ -1476,7 +1476,7 @@ static struct cont { struct task_struct *owner; /* task of first print*/ u64 ts_nsec; /* time of first print */ u8 level; /* log level of first message */ - u8 facility; /* log level of first message */ + u8 facility; /* log facility of first message */ enum log_flags flags; /* prefix, newline flags */ bool flushed:1; /* buffer sealed and committed */ } cont; @@ -1881,11 +1881,12 @@ static int __add_preferred_console(char *name, int idx, char *options, return 0; } /* - * Set up a list of consoles. Called from init/main.c + * Set up a console. Called via do_early_param() in init/main.c + * for each "console=" parameter in the boot command line. */ static int __init console_setup(char *str) { - char buf[sizeof(console_cmdline[0].name) + 4]; /* 4 for index */ + char buf[sizeof(console_cmdline[0].name) + 4]; /* 4 for "ttyS" */ char *s, *options, *brl_options = NULL; int idx; @@ -2045,8 +2046,8 @@ EXPORT_SYMBOL(console_lock); /** * console_trylock - try to lock the console system for exclusive use. * - * Tried to acquire a lock which guarantees that the caller has - * exclusive access to the console system and the console_drivers list. + * Try to acquire a lock which guarantees that the caller has exclusive + * access to the console system and the console_drivers list. * * returns 1 on success, and 0 on failure to acquire the lock. */