From patchwork Wed Jun 14 22:27:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Linton X-Patchwork-Id: 105597 Delivered-To: patch@linaro.org Received: by 10.140.91.77 with SMTP id y71csp512074qgd; Wed, 14 Jun 2017 15:27:42 -0700 (PDT) X-Received: by 10.99.97.137 with SMTP id v131mr2097022pgb.235.1497479262627; Wed, 14 Jun 2017 15:27:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497479262; cv=none; d=google.com; s=arc-20160816; b=b+vyf0o4k7/vtep6kiU+5OuznKv22orH14VkojEbojUvFlKkcCND3hK+Ii933K2vE/ hjUfDLxwzqQwllxiEXbwgXR1RJ1QtMr84dsTv6dem+XDdwLXY3HzdSY2B2i+AqE47hbA /27Pfl/Wv2xDrDccVYylJU9cDQIUZhXOxLdrO0n6A05czRGOWugHmqf/u7BzNRUTPDR1 TzEBLIVitezli0Lsy5LO3Ie8WNMXOza8jWD3LHdvuOnQzS3lNIsUqMU5lUvIbhMRhyHt WT9yhAfKL+T7YiBE0vV8V3cli5fOl8yBWtXIb3Q+o5qKe+rGFcWeY8LcaD2dSE897wT0 dWLA== 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=yFI65RvVtTM2ME5CyF/sgnN3FuRqBBLtJxdISzo+HMk=; b=SHvVoo3Byz172G7c/Y/+IjE5WjC6dxtoDNNR2LFTYX4K8upw8hEsEv1Ibq66AGF83n 4ojnfWfWugYCBSwrbskqnP5+q0cGOmuLvspts9ZBxG3bofFTlOXJVljC+15Am2cD+87p yXWDwjPjlPiIs2iwjwRHbo35GS7K7ApA+8mFBU9GerBwKnvDmq4GEsfkAp4ZC6PwihRj dUzytISBOKMgCiBj7HKxuhWXuJgday+yWzpfxWE3QNsuv1/2xZmTz9qtcdPdCzeh5XPp /492dx2yMIJI4/v638zHSRj/wMlWrY4Bqzm3AhnxiQAn3yw8S8isPzQkaEA/x7psHc6O 72cg== 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 33si886660plh.539.2017.06.14.15.27.42; Wed, 14 Jun 2017 15:27:42 -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 S1752731AbdFNW1i (ORCPT + 25 others); Wed, 14 Jun 2017 18:27:38 -0400 Received: from foss.arm.com ([217.140.101.70]:39680 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752661AbdFNW1g (ORCPT ); Wed, 14 Jun 2017 18:27:36 -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 84534174E; Wed, 14 Jun 2017 15:27:35 -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 EEFC63F3E1; Wed, 14 Jun 2017 15:27:34 -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 08/13] tracing: Rename enum_replace to eval_replace Date: Wed, 14 Jun 2017 17:27:24 -0500 Message-Id: <20170614222729.16521-9-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 The enum_replace stanza works as is for sizeof() calls as well as enums. Rename it as well. Signed-off-by: Jeremy Linton --- kernel/trace/trace_events.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) -- 2.9.4 diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c index e6897b0..83dfd0d 100644 --- a/kernel/trace/trace_events.c +++ b/kernel/trace/trace_events.c @@ -2067,12 +2067,12 @@ __register_event(struct trace_event_call *call, struct module *mod) return 0; } -static char *enum_replace(char *ptr, struct trace_eval_map *map, int len) +static char *eval_replace(char *ptr, struct trace_eval_map *map, int len) { int rlen; int elen; - /* Find the length of the enum value as a string */ + /* Find the length of the eval value as a string */ elen = snprintf(ptr, 0, "%ld", map->eval_value); /* Make sure there's enough room to replace the string with the value */ if (len < elen) @@ -2127,14 +2127,14 @@ static void update_event_printk(struct trace_event_call *call, if (isalpha(*ptr) || *ptr == '_') { if (strncmp(map->eval_string, ptr, len) == 0 && !isalnum(ptr[len]) && ptr[len] != '_') { - ptr = enum_replace(ptr, map, len); - /* Hmm, enum string smaller than value */ + ptr = eval_replace(ptr, map, len); + /* enum/sizeof string smaller than value */ if (WARN_ON_ONCE(!ptr)) return; /* - * No need to decrement here, as enum_replace() + * No need to decrement here, as eval_replace() * returns the pointer to the character passed - * the enum, and two enums can not be placed + * the eval, and two evals can not be placed * back to back without something in between. * We can skip that something in between. */