From patchwork Thu Jun 15 10:52:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 105635 Delivered-To: patch@linaro.org Received: by 10.140.91.77 with SMTP id y71csp740873qgd; Thu, 15 Jun 2017 03:54:26 -0700 (PDT) X-Received: by 10.101.87.206 with SMTP id q14mr4619777pgr.153.1497524066145; Thu, 15 Jun 2017 03:54:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497524066; cv=none; d=google.com; s=arc-20160816; b=iS3cjqPmupb1H6JiS20To/LHgaEHqlu3fCNBdZK0VZAGx6rneOX8HHt9cVMGTewLPg KOZW9CAcm3FqOvX9EL8Q7Xygeevroiw+HvfMV7Ii4ko5UwjEonX/1FWSBiuD/Z9xjuFv lcwxzYDT+wCyRNstU7UBJgWaQhyTeqE2AS4vgzc/jzDK6DOHyqNzzju5oG2ldaTUYH6D jJj8zqHrUA2whCQaGQRN3YNPGRVYylyBCSIiIGLKKTajT4/Iwl119z53rBvg34ihycu7 mSoo0/paGnY+XcAdPMcOs2Kolv3G2UGDE8mFGk4YAfpgg0cCXX/VcIE2D2Xz75HDDjda rOSw== 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=YxJFzK03Sz8E3XhyLHtzYJBmOEcgwoA5rDCD+turnw8=; b=g8YOfZTDCMWgWd5gLznQkH+jSNPHMxBSsCIxkkLEbOMG8m3IjgBa4kFnBA44sEaWL6 ec6HROFvwwau3zlAOZrWTCuy/gtMPSgTynrLtkiDxtuM4jIgr6zKZnI501Reh/vGJf0a d7aUElyiJGkyhr1C0s5jaHAwKnYhxFfB2gjGcTkYKBblsophS1ZLBmRh+I43PgZomEFf IdtPE+mdXWoRj8L8nG1IgWiKXaclCZKLnWy8NWOtzavVh0xoYHVZoofUwCmOXKf6rtLQ KEkUJoO/0bTt9WwKNvJGxHV5eACAGkad89TY/FCufdhLTV/5axNuE8qMh0SHQh1Sq2el U2+Q== 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.25; Thu, 15 Jun 2017 03:54:26 -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 S1752619AbdFOKyN (ORCPT + 25 others); Thu, 15 Jun 2017 06:54:13 -0400 Received: from mail.kernel.org ([198.145.29.99]:40600 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752105AbdFOKwz (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 361D5239F4; Thu, 15 Jun 2017 10:52:55 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 361D5239F4 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 1dLSOU-0003Lm-2H; Thu, 15 Jun 2017 06:52:54 -0400 Message-Id: <20170615105254.004426284@goodmis.org> User-Agent: quilt/0.63-1 Date: Thu, 15 Jun 2017 06:52:32 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Ingo Molnar , Andrew Morton , Jeremy Linton Subject: [for-next][PATCH 09/12] tracing: Rename enum_replace to eval_replace References: <20170615105223.551999981@goodmis.org> MIME-Version: 1.0 Content-Disposition: inline; filename=0009-tracing-Rename-enum_replace-to-eval_replace.patch Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jeremy Linton The enum_replace stanza works as is for sizeof() calls as well as enums. Rename it as well. Link: http://lkml.kernel.org/r/20170531215653.3240-9-jeremy.linton@arm.com Signed-off-by: Jeremy Linton Signed-off-by: Steven Rostedt (VMware) --- kernel/trace/trace_events.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) -- 2.10.2 diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c index e6897b005947..83dfd0dbbbfe 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. */