From patchwork Thu Jun 15 10:52:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 105641 Delivered-To: patch@linaro.org Received: by 10.140.91.77 with SMTP id y71csp741324qgd; Thu, 15 Jun 2017 03:55:47 -0700 (PDT) X-Received: by 10.84.218.76 with SMTP id f12mr5429455plm.269.1497524147329; Thu, 15 Jun 2017 03:55:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497524147; cv=none; d=google.com; s=arc-20160816; b=CN9GKgEmn0yL2sacUw4A5fXzF4Ky1Dv/CVnJusIHoTrqS+hWc6emIy9lCUOciifjFX oo3YvaLwX4+W1EjbcH00DKDB+ywfVAkL51yfuJIePat3xx6denhvL6F2EcnWKJTcK1q7 3k1kQFnayr5pSd1T7MRGM+5yaVNIEGmxIMEJxMPgZtWGu297VZTCB+EScvtdtEpXFioW XomFJ9R85WebLn5zaEbMaB5Lxs6VMNihOXK/q3FUp8ar/vbzmSiHobqZns+x/vxHpA7v gJ6zQceF2dqV9yUHPmbQAiFZbvKzXMHc6r74arRwErB6bz/DLL7KcxdHu0D6Cm0yKUmv efFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-disposition:mime-version :references:subject:cc:to:from:date:user-agent:message-id :dmarc-filter:arc-authentication-results; bh=BS7WyyhG5v2Tlj0gT4yfCO5an3dxxzgeVVOXcu4srNU=; b=MrHhSRFpVNpRTY4a3aQua79IhzVD86BqROsoWD0KXPG3WSteA3C6NEL40kyo6lE58i x6qNuUoqUrRSjPHtwelKY3SrQh9Bzxxw2CFwU0Re4a5vlq03VpKUIXYyE8qOPsEL5FpT OWJkCxsTaYbory+Mc4m9rC+KRoYY25MDPPlTtkF/AqeUX5fZRYtCDu3jRINEgN5fhohk cBbLWPx9MTrhDWaOGhZsynUM0zSZP/A/eheEJHmEX5HL3Rpk6M95hDGwnoFRO4dvALDT TsnVUGDgC/3OZjCKJiR15PqHSHuMvnG+JN9Iaz3zP1ZiAbHgioQgtZJFOGBgwqqdiPbZ urYA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p184si2061020pfp.90.2017.06.15.03.55.47; Thu, 15 Jun 2017 03:55:47 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752655AbdFOKyu (ORCPT + 25 others); Thu, 15 Jun 2017 06:54:50 -0400 Received: from mail.kernel.org ([198.145.29.99]:40574 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752053AbdFOKwz (ORCPT ); Thu, 15 Jun 2017 06:52:55 -0400 Received: from gandalf.local.home (cpe-67-246-153-56.stny.res.rr.com [67.246.153.56]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id BC652239E2; Thu, 15 Jun 2017 10:52:54 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BC652239E2 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=goodmis.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=rostedt@goodmis.org Received: from rostedt by gandalf.local.home with local (Exim 4.87) (envelope-from ) id 1dLSOT-0003KB-KI; Thu, 15 Jun 2017 06:52:53 -0400 Message-Id: <20170615105253.537390734@goodmis.org> User-Agent: quilt/0.63-1 Date: Thu, 15 Jun 2017 06:52:29 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Ingo Molnar , Andrew Morton , Jeremy Linton Subject: [for-next][PATCH 06/12] trace: rename trace_enum_mutex to trace_eval_mutex References: <20170615105223.551999981@goodmis.org> MIME-Version: 1.0 Content-Disposition: inline; filename=0006-trace-rename-trace_enum_mutex-to-trace_eval_mutex.patch Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jeremy Linton There is a lock protecting the trace_enum_map, rename it to reflect the use by more than enums. Link: http://lkml.kernel.org/r/20170531215653.3240-6-jeremy.linton@arm.com Signed-off-by: Jeremy Linton Signed-off-by: Steven Rostedt (VMware) --- kernel/trace/trace.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) -- 2.10.2 diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 13c81f4f2bd7..e0279f5dc83f 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -138,7 +138,7 @@ struct trace_eval_map_tail { const char *end; /* points to NULL */ }; -static DEFINE_MUTEX(trace_enum_mutex); +static DEFINE_MUTEX(trace_eval_mutex); /* * The trace_eval_maps are saved in an array with two extra elements, @@ -4785,7 +4785,7 @@ static void *enum_map_start(struct seq_file *m, loff_t *pos) union trace_eval_map_item *v; loff_t l = 0; - mutex_lock(&trace_enum_mutex); + mutex_lock(&trace_eval_mutex); v = trace_eval_maps; if (v) @@ -4800,7 +4800,7 @@ static void *enum_map_start(struct seq_file *m, loff_t *pos) static void enum_map_stop(struct seq_file *m, void *v) { - mutex_unlock(&trace_enum_mutex); + mutex_unlock(&trace_eval_mutex); } static int enum_map_show(struct seq_file *m, void *v) @@ -4865,7 +4865,7 @@ trace_insert_enum_map_file(struct module *mod, struct trace_eval_map **start, return; } - mutex_lock(&trace_enum_mutex); + mutex_lock(&trace_eval_mutex); if (!trace_eval_maps) trace_eval_maps = map_array; @@ -4890,7 +4890,7 @@ trace_insert_enum_map_file(struct module *mod, struct trace_eval_map **start, } memset(map_array, 0, sizeof(*map_array)); - mutex_unlock(&trace_enum_mutex); + mutex_unlock(&trace_eval_mutex); } static void trace_create_enum_file(struct dentry *d_tracer) @@ -7768,7 +7768,7 @@ static void trace_module_remove_enums(struct module *mod) if (!mod->num_trace_evals) return; - mutex_lock(&trace_enum_mutex); + mutex_lock(&trace_eval_mutex); map = trace_eval_maps; @@ -7785,7 +7785,7 @@ static void trace_module_remove_enums(struct module *mod) *last = trace_enum_jmp_to_tail(map)->tail.next; kfree(map); out: - mutex_unlock(&trace_enum_mutex); + mutex_unlock(&trace_eval_mutex); } #else static inline void trace_module_remove_enums(struct module *mod) { }