From patchwork Wed Jun 14 22:27:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Linton X-Patchwork-Id: 105604 Delivered-To: patch@linaro.org Received: by 10.140.91.77 with SMTP id y71csp512593qgd; Wed, 14 Jun 2017 15:29:25 -0700 (PDT) X-Received: by 10.84.233.141 with SMTP id l13mr2533439plk.298.1497479365299; Wed, 14 Jun 2017 15:29:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497479365; cv=none; d=google.com; s=arc-20160816; b=r1fmrAgRxQ6ryd0ifP1kOrr4n4P4f1AYrVA7LFbyr/5H6WHTyP68akCtZup0V/kjNW oOiG3zMrADhMy9HLtrP5+Df/p9WppPn0ZjFEJ4xAwzCuhuUyfkvuwlfdJIIHXuizQ9JQ 1Vq9wuhxoR6Vqg2V3ZKOTQAMcBb37uDF87HWOEYHzvbDhwNAgj+th7gM5AUacQRk8l0M 4sje0GEM9unMYEdi7SQjDSn5ai6ZED+xVKiGuk4j8x5WC4PINBwV4O07pbbHHqBCJ/KH cSOQOl0nMLjpy0E0D0K+8IGX2boXoym9mIGeOOeo3WcEqvY67prWf/hODOxcmeczVDow I8SA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=GUx7+JpHdmxk5KhW0Mz5PQRnvzOHodCSqd+InJ2gY58=; b=Kl+Xc/AOCpEkaQ7HA1zD0l91Y6QK/+xNmLS1QikzunpvODBA9jrC7sEJOYOcyc2NuO fEUD+mzD3Gn61ms+XEprSwSv331xxrnbktUfo+xnDOIwqBKgyH2tEJfa19Rq71DcvG5M gEPUklsquYb0rueiv2Ff5X3RTS+2/rPbY62NW/r3j8pyQhh5R2Cipq9y4x6jIScGU+wN 1fAJhssYMQCOjWpCOTGXXRKcDgKk15jWbZZMBqrcjTp7s4I+9YjiDQHVThbQo6XKGS6M L7GXZu4xa73Gs4QA4UDWNteZJOjmwM/tpmndlen9eV/Lyt7+Vca2F7dWim41OvYWI+sc R6rw== 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 q7si913063pli.267.2017.06.14.15.29.25; Wed, 14 Jun 2017 15:29:25 -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 S1752963AbdFNW3S (ORCPT + 25 others); Wed, 14 Jun 2017 18:29:18 -0400 Received: from foss.arm.com ([217.140.101.70]:39610 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752097AbdFNW1e (ORCPT ); Wed, 14 Jun 2017 18:27:34 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 5560616A3; Wed, 14 Jun 2017 15:27:34 -0700 (PDT) Received: from beelzebub.ast.arm.com (beelzebub.austin.arm.com [10.118.12.119]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id C12553F3E1; Wed, 14 Jun 2017 15:27:33 -0700 (PDT) From: Jeremy Linton To: linux-kernel@vger.kernel.org Cc: linux-arch@vger.kernel.org, rostedt@goodmis.org, mingo@redhat.com, rusty@rustcorp.com.au, jeyu@redhat.com, kirill.shutemov@linux.intel.com, christoffer.dall@linaro.org, marc.zyngier@arm.com, jcm@jonmasters.org, clemens@ladisch.de, perex@perex.cz Subject: [PATCH v2 06/13] trace: rename trace.c enum functions Date: Wed, 14 Jun 2017 17:27:22 -0500 Message-Id: <20170614222729.16521-7-jeremy.linton@arm.com> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170614222729.16521-1-jeremy.linton@arm.com> References: <20170614222729.16521-1-jeremy.linton@arm.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Rename the init and trace_enum_jmp_to_tail() routines to reflect their use by more than enumerated types. Signed-off-by: Jeremy Linton --- kernel/trace/trace.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) -- 2.9.4 diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index e1bc56c..5eda252 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -4810,7 +4810,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; @@ -4845,7 +4845,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; @@ -7707,7 +7707,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; @@ -7747,14 +7747,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); @@ -7811,7 +7811,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);