From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 345651537C9 for ; Fri, 2 Aug 2024 17:31:56 +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=1722619917; cv=none; b=oHnvddSakQkDWamfZ+y33AUU77oEzaBTw+6UYZSxo15M3ZJXIgEiRuJagZxjJmaHolsc+vHtsj1aATcmo9C1aqBosxoHmgArjf/p/H3LujyVuJO6EeJyShuUaQaEPqwNNviTwWYbd7tXe8lVf9GAEVaxfr/k55fhM68UrrwM0fc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722619917; c=relaxed/simple; bh=Gg2DVDqA/LwT3IjMa4puIXiJpu7pejl1bd/5JqefmJ4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=iBtIjlzQbP8H7vluM4bnUuSFnloX4/WcTOQzTjxs/ZizOhxDsJkLyANQNxzIlAC24PtbttGzr4FvgmbTeqyz4VplXPsj30B4CKNcucXaqkT0gfirom1BEgT+i7mdaGGjM0cW0UgIFEDcQnX7OaPnq/odkJz7FYlQdTMDH2OdfC8= 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 8F83E1684; Fri, 2 Aug 2024 10:32:21 -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 E5C4E3F64C; Fri, 2 Aug 2024 10:31:52 -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 v4 35/39] x86/resctrl: Remove a newline to avoid confusing the code move script Date: Fri, 2 Aug 2024 17:28:49 +0000 Message-Id: <20240802172853.22529-36-james.morse@arm.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20240802172853.22529-1-james.morse@arm.com> References: <20240802172853.22529-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 Tested-by: Carl Worth # arm64 --- 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 f5065414ca6a..a7e1a445559f 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, } #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