Received: by 2002:a05:6a10:a852:0:0:0:0 with SMTP id d18csp1301915pxy; Thu, 6 May 2021 05:17:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw18ZMfDuhEJgylZ6n9wwFxQolx/bcLthz5YgXjmnoVEppsWo8PlXGmk2FPcU97C+7RWleo X-Received: by 2002:aa7:d7c7:: with SMTP id e7mr4677979eds.132.1620303469299; Thu, 06 May 2021 05:17:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620303469; cv=none; d=google.com; s=arc-20160816; b=rg4BmzmApZ9zXvcpoZjBCkM9q2mkI6ZQMqCThGLoVaEmyWWJSR/NZanEZ+/y8LdBhf nuMqua4rx7V6Q1cpOh83mhdmfO4/EO3zUKsp2BXczRouWP1OWbXT2vF6BiY9+BRita8m 3/gJSjRXfYPIb7QcWvefSw/SgsulT+l5erHtDRExwKHtxiijVbvUbCbUHJaRoPddMJK3 ZoPf2C0xRuBe8eAt414cPle62j5RA2O14YNcC5ShtwgiH4/lZ381oYBtVeBF5B70h0AA AbQ1hD6puzNuFC6+6thILlloq9nMvdHovCJtbdnW3BlEdE6pCfz9Go9ec9ytjlVIkXt3 HaLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=fDAXsfq9HSSrj7Fsfp5QdM2dh8CR3kCK3AiBYsmbdoI=; b=DIbJ21Sjivm+gBCotP8Dt+EYB4lBVP0nRCA7UDBBhoyXGnssd+mY+pJdVD9DKECdvu hO2KbSAD70aOiUu1i3JOO6esEe4Mm6z4NSwV5c3ZceON8GiAbI5vk67XOTjYXVi6LZ9b ULll7EdNY/IC06QY0yrIE68+ZqqvawWywORkfYHSnOwcrSvL3Q45FrZPg8NTAoieR8YE oR7cFswGr2wB7iNcR17sID/qaTMfW3GDaLYccu7G+Th42zB/7bKJmkCntFGwtSMysXVc 3Y+PaLo5JAkMe/DL3prP1j0bAQ3PZN9f7fErE1blxPvv78gxBCvYOCsIE9VZdCawos1j Gtmg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=Yz3snebO; dkim=neutral (no key) header.i=@linutronix.de; 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=QUARANTINE dis=NONE) header.from=linutronix.de Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id q11si2117444edd.19.2021.05.06.05.17.24; Thu, 06 May 2021 05:17:49 -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=@linutronix.de header.s=2020 header.b=Yz3snebO; dkim=neutral (no key) header.i=@linutronix.de; 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=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233666AbhEFMPl (ORCPT + 99 others); Thu, 6 May 2021 08:15:41 -0400 Received: from Galois.linutronix.de ([193.142.43.55]:38656 "EHLO galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232974AbhEFMPG (ORCPT ); Thu, 6 May 2021 08:15:06 -0400 Date: Thu, 06 May 2021 12:14:07 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1620303248; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fDAXsfq9HSSrj7Fsfp5QdM2dh8CR3kCK3AiBYsmbdoI=; b=Yz3snebOTO0bv4Zrds0SM24Qnt8hdSZHJ41BGHLpg09bfWA9tJgw2nrqqDUnbwWWry1GAt usxuJfO2Y/1gSL8RBDBx5gFyBdBmvwLDhDZZOUM1VXybmg+VSITgzsXnQ69Ky0upFIpiSI kL8LUyBkGrSPP7R4wL9hreKdXuOV9PjoxNyoTeiYXhXE7NwF147bqv0OBhkDN+cfFcaEHv ZRAZxGzCoVmBPTaXcsZDaLqRrZf/HgReD//0LfiXEptzW8BxaXBmyKl/oonQXPWRlU1ZLf ZvLVAakGwkIFU5ivaEPsyCk6BNXBEz8hAhW+CIAkVWyMg9dklTIwDcWIcMFF1A== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1620303248; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fDAXsfq9HSSrj7Fsfp5QdM2dh8CR3kCK3AiBYsmbdoI=; b=tDD5LhPj/Si1vtesDOash4/kKE3j8vg7VO5tDfL/Mml3jkA5CB5zt9bvz6CwruKC6U4T7s V4odGC+xYcY0M+AQ== From: "tip-bot2 for Andi Kleen" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/urgent] x86/resctrl: Fix init const confusion Cc: Andi Kleen , Thomas Gleixner , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20210425211229.3157674-1-ak@linux.intel.com> References: <20210425211229.3157674-1-ak@linux.intel.com> MIME-Version: 1.0 Message-ID: <162030324755.29796.4163196088277383202.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the x86/urgent branch of tip: Commit-ID: 4029b9706d53e5e8db2e1cee6ecd75e60b62cd09 Gitweb: https://git.kernel.org/tip/4029b9706d53e5e8db2e1cee6ecd75e60b62cd09 Author: Andi Kleen AuthorDate: Sun, 25 Apr 2021 14:12:29 -07:00 Committer: Thomas Gleixner CommitterDate: Wed, 05 May 2021 21:50:14 +02:00 x86/resctrl: Fix init const confusion const variable must be initconst, not initdata. Signed-off-by: Andi Kleen Signed-off-by: Thomas Gleixner Link: https://lore.kernel.org/r/20210425211229.3157674-1-ak@linux.intel.com --- arch/x86/kernel/cpu/resctrl/monitor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kernel/cpu/resctrl/monitor.c b/arch/x86/kernel/cpu/resctrl/monitor.c index dbeaa84..f07c10b 100644 --- a/arch/x86/kernel/cpu/resctrl/monitor.c +++ b/arch/x86/kernel/cpu/resctrl/monitor.c @@ -84,7 +84,7 @@ unsigned int resctrl_cqm_threshold; static const struct mbm_correction_factor_table { u32 rmidthreshold; u64 cf; -} mbm_cf_table[] __initdata = { +} mbm_cf_table[] __initconst = { {7, CF(1.000000)}, {15, CF(1.000000)}, {15, CF(0.969650)},