Received: by 2002:a25:e74b:0:0:0:0:0 with SMTP id e72csp1970518ybh; Tue, 14 Jul 2020 11:58:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxxiPHlDrbrX+2V+DNZ7o2Cd3s5AHplz/qKudSqKoZdqgLc2iAFK67NNfsejsCfhbfplO0G X-Received: by 2002:a17:906:f2d6:: with SMTP id gz22mr5777142ejb.407.1594753088499; Tue, 14 Jul 2020 11:58:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594753088; cv=none; d=google.com; s=arc-20160816; b=UWv66d/hBFJnbebGzewusZRS1CTbh+7jPlYI6rOvoo2UBrTRzICqlIkQL4jcMVRfSC PXFISKVji5m/vQbZUcQjAXomsPu3xEBpYya7Ldb6aOMhB7uhiyopxTzT9YaTSuJNcAS2 gvMtRrbvyWz4hzNOH0OrMErKA76giGCMwG8TeNGUArSX7zGkKzmxfs5L3FnBExPobF0D P6tEYGwkgmqHk9D2Mlsnt4DE2IJ7oEDgG15/KA36Xohw3UmpvxuuPJRgW/XJLK8Slujs nVKO/bYqr7jHgd9B3DSVobVkOnVMpb/8QZOhjRrumxNTxJuRYd48/156kQMii9PsHVd2 g8ew== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=xeRLiPmMsqjWVYa+fSCghrFSxOTcBrunB1+jyqlOapY=; b=JLXlf1+aNANDtXfF0WBn3itvVSvkv5ziAoGKXvX2SMDpxD+WZjRm3eZ5SGYgbEGIvc HmgkzAiBfvu1XuD0bZhN0CKjwQgSJb1Ch+ve9ox1ZPWlhRfkJ1dPF1IP4DeND7oxswtl I/6N0062bXL5VVZynyypIEKpIR5rUy/m+/udBEzySaNQXIQz/aABb34h5VTdY6uw5wqy QremjGW2ovceRB7otwgOrPdVxpJJObywA/YG1use46yNsWR37Pcm+mG3oqG0ymwq9diU VvhafzxHRlCgWErA+nMeurSaB+xfBGUnOueh7nE25vOgG6EFUT9DzLVyiJQGvFxCMJBq ckrQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=P4zfaGqS; 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 da8si12022802edb.564.2020.07.14.11.57.45; Tue, 14 Jul 2020 11:58:08 -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=P4zfaGqS; 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 S1730770AbgGNSyd (ORCPT + 99 others); Tue, 14 Jul 2020 14:54:33 -0400 Received: from mail.kernel.org ([198.145.29.99]:51922 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730754AbgGNSy1 (ORCPT ); Tue, 14 Jul 2020 14:54:27 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 A0F2222BED; Tue, 14 Jul 2020 18:54:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1594752867; bh=sIUlAmhTnfBS1jKcMvo/2Rk0jPaABNfNX5aq1FKva4I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=P4zfaGqSCKKX8eYvwxalLTvkse0RQnVExnf/s1+Nf9Ti+pxvOSYTC/yn9AGAv04b4 9VJDQCB5WEtjyRSiXklFEn4gDF10zCB6lxeUXuyx6jxpXaGceMnko8GdV+FXwGHzp6 hb0jM7L/Lr1cL228Z4RvS/BbDIRBuLDeiMga1LBc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ingo Molnar , Kim Phillips , Peter Zijlstra , Sasha Levin Subject: [PATCH 5.7 006/166] perf/x86/rapl: Fix RAPL config variable bug Date: Tue, 14 Jul 2020 20:42:51 +0200 Message-Id: <20200714184116.180516995@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200714184115.844176932@linuxfoundation.org> References: <20200714184115.844176932@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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