Received: by 2002:a25:683:0:0:0:0:0 with SMTP id 125csp1225999ybg; Tue, 2 Jun 2020 04:43:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxg2sp7ih+tQea45PGyP0tk3zqgFyvZcF9fhEstpEFg4GsSF/ZaacySnk6cbFELSlYGWudZ X-Received: by 2002:a17:906:1ed2:: with SMTP id m18mr4910137ejj.529.1591098190418; Tue, 02 Jun 2020 04:43:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1591098190; cv=none; d=google.com; s=arc-20160816; b=xDd60PkvseF1CjxXuZo/6gt2s3CiWtGFsQ9E4zkywosq9nWaAyT+i/oaZxEpGL1aNJ S/N7CnxIfTkPKl+UwVSc5ZveYQttSR/aLdMPsd23Xr9Bg8pYYanAXh2G2j1EU2KLlb3W d7vlkrtmtMGOcuVg6ZTRbsBZ/Z3+XPfhFIQc+gCm/LLP+Gbv82zF4uMo9mtZqOlE57fC 8K87843cR72Y/sulsJjuhbJxpXZFQUfOwlOYJM7YUxJKdHaxNpfZFcQsf9jW4uQycg5f mNbRJJFY4XTdEruvYytkskjS19VdhzkLhJsfJjEHPgntQA2rvQM9CICaC5klMctXC+Vo 1FMQ== 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=QIOCY07x7rwcy0s5BsM2jP04JzgU/cKsXlL9uxT9ixA=; b=JH51nhpoUIxZ2oeeXWTei1CKdmLqyodDykq3+PnrtPCmlPOfTPDS8k9NnTiTqDsdE9 BBw3mx3/t94GoH73Unp8LGKafK2DmLEz6Mr0bJFzSXXBV3okDgOU1xrzJEaKew9Jzfxg qKmnqphF2PnGoxwdmQ4X/dEIrTtLAiVRilCGOqetaiDtZf82ZpQ7tUDirsclTcoTLOC9 kN1DklW70f2whCoNVVW1nZ5HjP+ZEnORkgY8t2eWG8674YKuA24SG+poIp0BulcjLm90 4wiIBvBqsgaxoHgqLtu5NW/5cWVVEBJ4MeKi7xQkjCkbXO32eqfx2Yyaju2OC+7es7Bt HZ1A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id bs21si1383154edb.87.2020.06.02.04.42.46; Tue, 02 Jun 2020 04:43:10 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726130AbgFBLlD (ORCPT + 99 others); Tue, 2 Jun 2020 07:41:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32992 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725919AbgFBLlC (ORCPT ); Tue, 2 Jun 2020 07:41:02 -0400 Received: from Galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C11E1C061A0E; Tue, 2 Jun 2020 04:41:02 -0700 (PDT) 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 1jg5Hr-000499-3z; Tue, 02 Jun 2020 13:40:55 +0200 Received: from [127.0.1.1] (localhost [IPv6:::1]) by tip-bot2.lab.linutronix.de (Postfix) with ESMTP id 8CB2B1C01BB; Tue, 2 Jun 2020 13:40:54 +0200 (CEST) Date: Tue, 02 Jun 2020 11:40:54 -0000 From: "tip-bot2 for Stephane Eranian" Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: perf/urgent] perf/x86/rapl: Fix RAPL config variable bug Cc: Ingo Molnar , Kim Phillips , Peter Zijlstra , x86 , LKML In-Reply-To: <20200528201614.250182-1-eranian@google.com> References: <20200528201614.250182-1-eranian@google.com> MIME-Version: 1.0 Message-ID: <159109805436.17951.2430178152420855778.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/urgent branch of tip: Commit-ID: 16accae3d97f97d7f61c4ee5d0002bccdef59088 Gitweb: https://git.kernel.org/tip/16accae3d97f97d7f61c4ee5d0002bccdef59088 Author: Stephane Eranian AuthorDate: Thu, 28 May 2020 13:16:14 -07:00 Committer: Ingo Molnar CommitterDate: Tue, 02 Jun 2020 11:52:56 +02:00 perf/x86/rapl: Fix RAPL config variable bug This patch fixes a bug introduced by: fd3ae1e1587d6 ("perf/x86/rapl: Move RAPL support to common x86 code") The Kconfig variable name was wrong. It was missing the CONFIG_ prefix. Signed-off-by: Stephane Eranian Signed-off-by: Ingo Molnar Tested-by: Kim Phillips Acked-by: Peter Zijlstra Link: https://lore.kernel.org/r/20200528201614.250182-1-eranian@google.com --- arch/x86/events/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/events/Makefile b/arch/x86/events/Makefile index 12c42eb..9933c0e 100644 --- a/arch/x86/events/Makefile +++ b/arch/x86/events/Makefile @@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0-only obj-y += core.o probe.o -obj-$(PERF_EVENTS_INTEL_RAPL) += rapl.o +obj-$(CONFIG_PERF_EVENTS_INTEL_RAPL) += rapl.o obj-y += amd/ obj-$(CONFIG_X86_LOCAL_APIC) += msr.o obj-$(CONFIG_CPU_SUP_INTEL) += intel/