From patchwork Thu Jun 15 10:52:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 105637 Delivered-To: patch@linaro.org Received: by 10.140.91.77 with SMTP id y71csp740963qgd; Thu, 15 Jun 2017 03:54:41 -0700 (PDT) X-Received: by 10.84.184.12 with SMTP id l12mr5583695plc.296.1497524081227; Thu, 15 Jun 2017 03:54:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497524081; cv=none; d=google.com; s=arc-20160816; b=vNl7yQ9PuOmZk6SppOND7QgnU6VtGfejtrpBD+SD7uDpn/QDbbCDNoMUhDuaCooPLj vsCsngMT69WPRAsplUw0tqQM6MMvtHVAJjpWlbuu2JwGV3yxMTfxPRnj6JGFfYU/+DnF lhKAFZ7ZBq73Yr9ZO5cY9/WMsW/i6idCaw8aCiMgqTSzjMsm+YnwckRZaUnhG7cC+p8I unQw9AwawjQRq9o+NKlOtEjLbWd76ycB7b6oKFPAYRpXjtSsHLZy2do9PbdIsydtH7Nw CrM/9u35W4vWca8/Y1bMScmQk3Pf0NV66CFoWmr3o5n+nLIGK40XtlCWMhESm0tPbCTS FHuw== 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=iiwSl+cpoMIk5MriKOzKBan9I1monrQzXqE8v+Wy3LQ=; b=dbG6M1wlxh8D4TTzhfLI/o+E1m27FqzEY0xu2advGmgtbwaLmjjke9VN72C/9g2ENR irz+Q7ewb6G9c/Yx7aL3lKkPZt2Ba645F6wqvmUrZzp9dTWpDCmBfz6dAhl9SjWkDB8e UnOuy/TJP3z2X5+rnIZuzSBIAq+p6yBexhv2uUd9osIza/QtYGqnSrP6rEKnFJszB6Hh TbI/pi8ctE/PKU9miHgeZY4g6hn2XO7qH9QvaGOUYpAyDdHvxmzFV7839/d5ampW9RkB zDkHMaUkfrbidqx+10EySb+XBc44siy4TUHKtIXVWLI9ZqbPIjTjbjGiD4qQWts3+2BY 5SUg== 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 j19si416558pgn.452.2017.06.15.03.54.40; Thu, 15 Jun 2017 03:54:41 -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 S1752642AbdFOKyh (ORCPT + 25 others); Thu, 15 Jun 2017 06:54:37 -0400 Received: from mail.kernel.org ([198.145.29.99]:40586 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751829AbdFOKwz (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 D8B27239B6; Thu, 15 Jun 2017 10:52:54 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D8B27239B6 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-0003Ki-Ob; Thu, 15 Jun 2017 06:52:53 -0400 Message-Id: <20170615105253.693823548@goodmis.org> User-Agent: quilt/0.63-1 Date: Thu, 15 Jun 2017 06:52:30 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Ingo Molnar , Andrew Morton , Jeremy Linton Subject: [for-next][PATCH 07/12] trace: rename trace.c enum functions References: <20170615105223.551999981@goodmis.org> MIME-Version: 1.0 Content-Disposition: inline; filename=0007-trace-rename-trace.c-enum-functions.patch Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jeremy Linton Rename the init and trace_enum_jmp_to_tail() routines to reflect their use by more than enumerated types. Link: http://lkml.kernel.org/r/20170531215653.3240-7-jeremy.linton@arm.com Signed-off-by: Jeremy Linton Signed-off-by: Steven Rostedt (VMware) --- kernel/trace/trace.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) -- 2.10.2 diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index e0279f5dc83f..d703f429bbd9 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -4837,7 +4837,7 @@ static const struct file_operations tracing_enum_map_fops = { }; static inline union trace_eval_map_item * -trace_enum_jmp_to_tail(union trace_eval_map_item *ptr) +trace_eval_jmp_to_tail(union trace_eval_map_item *ptr) { /* Return tail of array given the head */ return ptr + ptr->head.length + 1; @@ -4872,7 +4872,7 @@ trace_insert_enum_map_file(struct module *mod, struct trace_eval_map **start, else { ptr = trace_eval_maps; for (;;) { - ptr = trace_enum_jmp_to_tail(ptr); + ptr = trace_eval_jmp_to_tail(ptr); if (!ptr->tail.next) break; ptr = ptr->tail.next; @@ -7735,7 +7735,7 @@ struct dentry *tracing_init_dentry(void) extern struct trace_eval_map *__start_ftrace_eval_maps[]; extern struct trace_eval_map *__stop_ftrace_eval_maps[]; -static void __init trace_enum_init(void) +static void __init trace_eval_init(void) { int len; @@ -7775,14 +7775,14 @@ static void trace_module_remove_enums(struct module *mod) while (map) { if (map->head.mod == mod) break; - map = trace_enum_jmp_to_tail(map); + map = trace_eval_jmp_to_tail(map); last = &map->tail.next; map = map->tail.next; } if (!map) goto out; - *last = trace_enum_jmp_to_tail(map)->tail.next; + *last = trace_eval_jmp_to_tail(map)->tail.next; kfree(map); out: mutex_unlock(&trace_eval_mutex); @@ -7839,7 +7839,7 @@ static __init int tracer_init_tracefs(void) trace_create_file("saved_cmdlines_size", 0644, d_tracer, NULL, &tracing_saved_cmdlines_size_fops); - trace_enum_init(); + trace_eval_init(); trace_create_enum_file(d_tracer);