Received: by 2002:a89:413:0:b0:1fd:dba5:e537 with SMTP id m19csp882986lqs; Fri, 14 Jun 2024 08:17:04 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCV4O3jGuEbxCgm6KMg6rS/1myApFZo+ks2nzFSJSG0aZgOZlCL9hTygcQTKl10JO17MRlf8J1MaMgni3Y5/4H9yJ7ZG0KfHpSJHz1nnAQ== X-Google-Smtp-Source: AGHT+IEOoNXbTwZndZc6AWkcIlvLLx8VMR5HmN6kziSMoJZn8pR2kQg1PjKRrLmKB6QjOl+UEGxg X-Received: by 2002:a17:903:1c7:b0:1f7:364f:1162 with SMTP id d9443c01a7336-1f8627cb650mr29448515ad.31.1718378224551; Fri, 14 Jun 2024 08:17:04 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1718378224; cv=pass; d=google.com; s=arc-20160816; b=dBPYS0PoHioM/2QBeivkg7D0t3Nr+RVpifCMTTxJlFVkWtRivI7cejGLhpfiOQ/d+f Y8ZcBfaxLW4LRbFWs5P0Whw1u0e+uEgKw1OeRsy/aSd2CpNJ/HTVf3wtUnueyT3WKS0t Yy3zeCH/KR9P35ZC8Te2npIt/CUby2yALk8d46/rQqAkUPGZcIwHMHZSMBBy10j0JEVY 9vy8m7qDK+r/0rsSynWL6XEKDeUKUiHbgBRQ2XxEPs1zoYufCKcdKrznufejsGaON2cj V/pgkDefRCuzb1iJWgiBFkQ/ugmvKxbkyiVIJwVtuEYQEt2pCqy5/Ag9JYvYPqMtKcsx MMzw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from; bh=CCphMEXSGzH+YOG8KvQJgRXsCEJ0Rfre3qUut052C6g=; fh=knouHfhWmUABu+sT2q0nnGKUzC7/WRiZH1KSpGv7uFs=; b=GmZQnQqWw491gru7GstyZjB05/9U6h1S/VzbivMOitdawxlTJCldsrnFpyB4oW91HZ XersV3f+icU0YWipt+0nceJ6v1sspJTjlS40QNnvJ3Egu0lOWLVNqysoDmh/TykF9XqL gMHhvxa233u6y1WSWoqw9gsOdjnTuTcuJhMEvT7STR4pQ3efQRuOJrgHyFQds0j03A9X 55TPJ1k5b+pdQG7edbjSlDXTtId/llfdgw2ler1womkO1E9ZpoEXa7Or6fU1hnNPVEc0 wZnKHBg4/CNh0RTaViCZ4/ZUy8H02A2goG+0JfJJZ3f50EPTCq53Upnz4pCyUJtGJZ9o 20jA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1 spf=pass spfdomain=arm.com dmarc=pass fromdomain=arm.com); spf=pass (google.com: domain of linux-kernel+bounces-215103-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-215103-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id d9443c01a7336-1f855ee345dsi36734855ad.368.2024.06.14.08.17.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Jun 2024 08:17:04 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-215103-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; arc=pass (i=1 spf=pass spfdomain=arm.com dmarc=pass fromdomain=arm.com); spf=pass (google.com: domain of linux-kernel+bounces-215103-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-215103-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 45A7A28C642 for ; Fri, 14 Jun 2024 15:09:02 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 938DD1AED46; Fri, 14 Jun 2024 15:03:08 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id D4DFE16B73A for ; Fri, 14 Jun 2024 15:03:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718377388; cv=none; b=nQbKaf9nlxPrZJtTT6Z4WwZhD4DLiczRqZ222Tb2Ml0vjUEhHVfGfx0+1WntvKeIr62JmPsbe2zma54DODfJXnrAzmTfDWJW+oWSruRfdQM10r5FRNM3/b4/8CDObRm7pn/AXekMSBQoc/qlAOKm49F9lrCi5CsCoKOrFxpN3W0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718377388; c=relaxed/simple; bh=rE1r9FoHA7AlxYiMFNpcjGUolLlR1G3IH+9oFtwrOU4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=E+RY3dDAc25ClllrnuC2gyOuCXYAlomWm9p2yM+PuiC6pJrww9fG2aoaPr5g8XGtuJiT0YuJy5PPJ42e1q2kBHI8W3ZUhtCvNXUyQ5jlSqf7ScFgNzWyCCeDPqm3tCYkrY0NYw7Rpr2AqlA8+DnqTcA/kOJ7ZD733eJ2u5fNGU0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 90BC91C01; Fri, 14 Jun 2024 08:03:30 -0700 (PDT) Received: from merodach.members.linode.com (usa-sjc-mx-foss1.foss.arm.com [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id C1C0E3F5A1; Fri, 14 Jun 2024 08:03:02 -0700 (PDT) From: James Morse To: x86@kernel.org, linux-kernel@vger.kernel.org Cc: Fenghua Yu , Reinette Chatre , Thomas Gleixner , Ingo Molnar , Borislav Petkov , H Peter Anvin , Babu Moger , James Morse , shameerali.kolothum.thodi@huawei.com, D Scott Phillips OS , carl@os.amperecomputing.com, lcherian@marvell.com, bobo.shaobowang@huawei.com, tan.shaopeng@fujitsu.com, baolin.wang@linux.alibaba.com, Jamie Iles , Xin Hao , peternewman@google.com, dfustini@baylibre.com, amitsinght@marvell.com, David Hildenbrand , Rex Nie , Dave Martin Subject: [PATCH v3 35/38] x86/resctrl: Remove a newline to avoid confusing the code move script Date: Fri, 14 Jun 2024 15:00:30 +0000 Message-Id: <20240614150033.10454-36-james.morse@arm.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20240614150033.10454-1-james.morse@arm.com> References: <20240614150033.10454-1-james.morse@arm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The resctrl filesystem code will shortly be moved to /fs/. This involves splitting all the existing files, with some functions remaining under arch/x86, and others moving to fs/resctrl. To make this reproducible, a python script does the heavy lif^W copy-and-paste. This involves some clunky parsing of C code. The parser gets confused by the newline after this #ifdef. Just remove it. Signed-off-by: James Morse --- This patch, and the post-move cleanup could all be merged together. It's included like this to make the move script easier to work with. Changes since v2: * This patch is new. --- arch/x86/kernel/cpu/resctrl/rdtgroup.c | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/x86/kernel/cpu/resctrl/rdtgroup.c b/arch/x86/kernel/cpu/resctrl/rdtgroup.c index f13b5b0404e4..969c454b67f1 100644 --- a/arch/x86/kernel/cpu/resctrl/rdtgroup.c +++ b/arch/x86/kernel/cpu/resctrl/rdtgroup.c @@ -880,7 +880,6 @@ static int rdtgroup_rmid_show(struct kernfs_open_file *of, } #ifdef CONFIG_PROC_CPU_RESCTRL - /* * A task can only be part of one resctrl control group and of one monitor * group which is associated to that control group. -- 2.39.2