Received: by 2002:a25:d783:0:0:0:0:0 with SMTP id o125csp696351ybg; Thu, 19 Mar 2020 07:11:46 -0700 (PDT) X-Google-Smtp-Source: ADFU+vtVvYa3Npx7bTJQnBHrmiVMytWiFAN6ueMNKUdBDaC6S44VSNe9IXVWMv50QWl2ELFpJqEe X-Received: by 2002:a9d:4b98:: with SMTP id k24mr2380505otf.26.1584627106286; Thu, 19 Mar 2020 07:11:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1584627106; cv=none; d=google.com; s=arc-20160816; b=W2ZRSgt7CvhZkAdhf4mmG3RxGJPbO55/+pBKZJqgiHisjfI9yDV3eHip0+mdxB77w8 qlCrYHr8wZ3/EQUSPm6I/HHIRHH2mpny7wZIg9h8V4D1jGnL7ELcsLe5DxjkmedYGc/O Ri2ji13VLTr0f+jvW3Eacds6J27V/TjKJOk8Fs9JuXYEQy/uoDq0J+7OroHNBHzmm+WT pHLxO1lS7cY8a6lFncBu6RkqcLbTHxQC9uSwJQ8BT+xiC25dj7xSxkZTs1WJUPo4yFCe KU5WEglJg5rHraQ3265UT6dGGenD5wQPIcSXuZ4mbIpu6kq4dDnUl9BVJnPYpGooGhfl kVRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding :robot-unsubscribe:robot-id:message-id:mime-version:references :in-reply-to:cc:subject:to:reply-to:from:date; bh=J7Zzecl6oiUq3ME9pQNK+jaIyWQ97xvnhSwt+yyM6us=; b=MRyZ9AgMS7LBxvFL7V4jOJk1OxXe64OfZkejfQ2bTCdMjBbNmzquiSgm0cRoB8iP1c WzeRk9ARS1dShdRD0nu7tn4TqJ2TB1TiY7guZlpYMalS/kI1TPw9ck5XMpc4zZ3UlzDo YDXj4H1lLrD9ky0DbeESzWHXhF5B4CDy/uIVhKWCHYrXmgUdliwn9Yjr3+ZxgXKesMf+ DT0uK2orNn4QM0AR986k7lYEdXnetjD6Rg1XWnzSpdJiDTUwo9TcdgBEI2LoUqZyMNy9 +0PTN+rTqHu7GzYzLBPN57vlfCf8RXH4MeuwiXwApArHKUNX4C9Cz+KXPpUs8AMvzCvk JiSA== 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 v126si1132953oia.106.2020.03.19.07.11.17; Thu, 19 Mar 2020 07:11:46 -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 S1727667AbgCSOKw (ORCPT + 99 others); Thu, 19 Mar 2020 10:10:52 -0400 Received: from Galois.linutronix.de ([193.142.43.55]:60811 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726936AbgCSOKs (ORCPT ); Thu, 19 Mar 2020 10:10:48 -0400 Received: from [5.158.153.53] (helo=tip-bot2.lab.linutronix.de) by Galois.linutronix.de with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA256:256) (Exim 4.80) (envelope-from ) id 1jEvse-0001zI-Hs; Thu, 19 Mar 2020 15:10:40 +0100 Received: from [127.0.1.1] (localhost [IPv6:::1]) by tip-bot2.lab.linutronix.de (Postfix) with ESMTP id 09E671C22A3; Thu, 19 Mar 2020 15:10:40 +0100 (CET) Date: Thu, 19 Mar 2020 14:10:39 -0000 From: "tip-bot2 for Jiri Olsa" Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: perf/core] perf expr: Fix copy/paste mistake Cc: Jiri Olsa , Alexander Shishkin , Andi Kleen , Kajol Jain , Michael Petlan , Namhyung Kim , Peter Zijlstra , Arnaldo Carvalho de Melo , x86 , LKML In-Reply-To: <20200315155609.603948-1-jolsa@kernel.org> References: <20200315155609.603948-1-jolsa@kernel.org> MIME-Version: 1.0 Message-ID: <158462703969.28353.11784055871858151116.tip-bot2@tip-bot2> X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Linutronix-Spam-Score: -1.0 X-Linutronix-Spam-Level: - X-Linutronix-Spam-Status: No , -1.0 points, 5.0 required, ALL_TRUSTED=-1,SHORTCIRCUIT=-0.0001 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the perf/core branch of tip: Commit-ID: 59a08b4b3b1a9374adacd13cd7544c03e5582e0e Gitweb: https://git.kernel.org/tip/59a08b4b3b1a9374adacd13cd7544c03e5582e0e Author: Jiri Olsa AuthorDate: Sun, 15 Mar 2020 16:56:09 +01:00 Committer: Arnaldo Carvalho de Melo CommitterDate: Tue, 17 Mar 2020 18:01:40 -03:00 perf expr: Fix copy/paste mistake Copy/paste leftover from recent refactor. Fixes: 26226a97724d ("perf expr: Move expr lexer to flex") Signed-off-by: Jiri Olsa Cc: Alexander Shishkin Cc: Andi Kleen Cc: Kajol Jain Cc: Michael Petlan Cc: Namhyung Kim Cc: Peter Zijlstra Link: http://lore.kernel.org/lkml/20200315155609.603948-1-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/expr.l | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/perf/util/expr.l b/tools/perf/util/expr.l index 1928f2a..eaad292 100644 --- a/tools/perf/util/expr.l +++ b/tools/perf/util/expr.l @@ -79,10 +79,10 @@ symbol {spec}*{sym}*{spec}*{sym}* { int start_token; - start_token = parse_events_get_extra(yyscanner); + start_token = expr_get_extra(yyscanner); if (start_token) { - parse_events_set_extra(NULL, yyscanner); + expr_set_extra(NULL, yyscanner); return start_token; } }