From nobody Thu Nov 28 05:37:11 2024 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 83F011DD872 for ; Fri, 4 Oct 2024 18:07:01 +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=1728065222; cv=none; b=sL8we9CChxxn4VrElBk63kPap0Ex68Q+y6/RP8kn+qblhIOIbVxK0g4nk0jGIPuWsnC+nAacUc7n9Dxpbei6dxVtPhcITb6O5f45Myc01t7HjnuNe8nv39d3U5UO4CV/g/Sw+PifnBfbiDa5nLfwP2sbKbo/RqIq7agFnCNhT+8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728065222; c=relaxed/simple; bh=5LTohyj7kw/uLwXsxBS0/zGWWRi8H8FrMQACiAPPsZ8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=E0H99/4qn5ffsNziFqJ9KIqXZo9jULO2ZyiEUBtJjO1N87WaE46iV2iBOWflZBTnBj6CvnPfhpAMcuxLxJUWwF6b44efM+afBT2P6Isn9zD3sca03rJS5272eDBKJd6HH8N05m7YH62VW1vDVZlsCbfEHlTXt/Dq00SQ4s8ryPI= 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 A9087150C; Fri, 4 Oct 2024 11:07: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 1264B3F58B; Fri, 4 Oct 2024 11:06:57 -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 , Shaopeng Tan Subject: [PATCH v5 36/40] x86/resctrl: Remove a newline to avoid confusing the code move script Date: Fri, 4 Oct 2024 18:03:43 +0000 Message-Id: <20241004180347.19985-37-james.morse@arm.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20241004180347.19985-1-james.morse@arm.com> References: <20241004180347.19985-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: quoted-printable Content-Type: text/plain; charset="utf-8" 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 Tested-by: Carl Worth # arm64 Tested-by: Shaopeng Tan Reviewed-by: Shaopeng Tan --- 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/r= esctrl/rdtgroup.c index 7a4716fb1604..9696bdcc39f2 100644 --- a/arch/x86/kernel/cpu/resctrl/rdtgroup.c +++ b/arch/x86/kernel/cpu/resctrl/rdtgroup.c @@ -874,7 +874,6 @@ static int rdtgroup_rmid_show(struct kernfs_open_file *= of, } =20 #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. --=20 2.39.2