Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp1081899ybt; Wed, 1 Jul 2020 18:23:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJziGEeBDxfp7H5OHRzJhoBMY+r878OjgZA+l0pGra8WaCvIzSrE+lb4Tl/YuewRdUo49rI6 X-Received: by 2002:a17:906:1455:: with SMTP id q21mr8874163ejc.139.1593653024319; Wed, 01 Jul 2020 18:23:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593653024; cv=none; d=google.com; s=arc-20160816; b=qfz4rW3LsOymJzG65kMNaZid9zOjGFvjSVAq6ckU88K3yMIznXqrel08VcFuTWxjMk hKA9DyxU3ROWP1XIRUbEmSwU2Phb7KD2O2P6O+FGBj7iMDAZ2BRvYRwZxLxHbg4+yRCq fRn8gZkz47iRMojC3WGEs6sgQgj3sCoSseG+R/iJUg9hlbLMaZPUjRp9LmXhpzWqiEV8 tucdaa0op0u1CB43Bls18/UG9GN36Acy+D3d707+2p+4/jCqBnYI95XRXaOa/uyptMVl rudJTNxFRT8e/GJQjIcMy9bJSqHc8Bwsrr3yMnQIPWI8tdC6iVkXb2KR9dIUSTspOQNL l3Og== 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:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=xeRLiPmMsqjWVYa+fSCghrFSxOTcBrunB1+jyqlOapY=; b=iqdp+kzLAvlBFFu97NXjfhTBa4Yicl1t6usqt/DFS7jvF+Ls7FjdRV9lbS9GS3+Oc/ W2NZVOtkktRGtpCVEoT2iwEr6h1N7pICqTDofZNc+M1AG44D3Jq8kW5/D6PXzOspNbCC GgFqgTbgBRqNP49hpJvQ2RVjtpMqYuyAmN0JZz/RA4YRl8lC9hZC8znnzzPmKnkOm3qH V/JX3ffE0iRl1TNZhl/F/jozNDdW3YMYTmXq1qtRu6tVKElk7xGONfhh0MWlLoEejiVO O1PbgT8n9gvmMH/ApHqSmo603hrPKWkCO1r06QRX/wsX75qyAp+MLX5HwXNKLH1NJHNY doGQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=wCpinOjY; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id d18si4932303edy.194.2020.07.01.18.23.21; Wed, 01 Jul 2020 18:23:44 -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; dkim=pass header.i=@kernel.org header.s=default header.b=wCpinOjY; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728165AbgGBBXA (ORCPT + 99 others); Wed, 1 Jul 2020 21:23:00 -0400 Received: from mail.kernel.org ([198.145.29.99]:53280 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726073AbgGBBXA (ORCPT ); Wed, 1 Jul 2020 21:23:00 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id EA65220748; Thu, 2 Jul 2020 01:22:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593652979; bh=sIUlAmhTnfBS1jKcMvo/2Rk0jPaABNfNX5aq1FKva4I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wCpinOjYC3wiFVmwlhuH2UxhMFpHc6q7++w0o/Er8FU8+SdAcCTv2wPzCbgPdN4JA qeR5stPayfF5fK8EhXDJvzmXfDx7QB1XPZE5w8KYCiGFeiSA30OAFtzA9FUVp4FrLE qo3SFst5M/JAAL2wmpEY/8AzuPgost0HkoHuuH7E= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Stephane Eranian , Ingo Molnar , Kim Phillips , Peter Zijlstra , Sasha Levin Subject: [PATCH AUTOSEL 5.7 04/53] perf/x86/rapl: Fix RAPL config variable bug Date: Wed, 1 Jul 2020 21:21:13 -0400 Message-Id: <20200702012202.2700645-4-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200702012202.2700645-1-sashal@kernel.org> References: <20200702012202.2700645-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Stephane Eranian [ Upstream commit 16accae3d97f97d7f61c4ee5d0002bccdef59088 ] 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 Signed-off-by: Sasha Levin --- 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 b418ef6878796..726e83c0a31a1 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/ -- 2.25.1