From patchwork Mon Apr 17 23:34:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Moger, Babu" X-Patchwork-Id: 84505 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2474469vqo; Mon, 17 Apr 2023 16:50:32 -0700 (PDT) X-Google-Smtp-Source: AKy350bw1h4FNQpnDVeD0fuHbIziq4jG/f2a1z5T0DLC6Ov8ZTT82uQppQa3kpncADaBt8wiJKst X-Received: by 2002:a17:90a:c381:b0:247:40f1:79d7 with SMTP id h1-20020a17090ac38100b0024740f179d7mr148317pjt.34.1681775432016; Mon, 17 Apr 2023 16:50:32 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1681775432; cv=pass; d=google.com; s=arc-20160816; b=cQrU2Es8DNkVObFxw+wnBztq/3SNxkF0AO3bW/mAWZeQndgONYoW5xG2im3z0iASym hPE1FuGb6IsYmr0Yoy2P/Z6yUEazJM4WCNDW+83QpkEDPxiiPfHjiSy7kHZuSVRBGGWW aSJm+5U9fz9tkwqjPhFZqgX7fvFHc096k7X6iNj4/NWYcR9wnT2i30KoP/fjxK7hVwvN VkoMVaKpogA+aRpGBuC8dxRx0PZl/vm8HSfLfkP5zWOhx694jl20Dd6wf7svGUYuGWQ2 YQ8J7WgkNS+zPtK99WYpiu5ksR4zn4/9FugagVLJHla00868SqsTOIsdEzGR+d4Z3WTu KGzw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:cc:to:from :subject:dkim-signature; bh=amRrXNdXe01eIp0BrIPD37BmK+wPf1VLsqKbRdfu66k=; b=W5pO9Bm/FwvefvRS3/E8bdlNBT0zCbZr3q+hcdyiRRd8kiCCKzFNOFkZaME5UL1edT NCKvgZJgvfu/4ej5LitGJLmQ2DJ+O0mFOtYU5JAxbRrv3KsHodksIYk9yRRfNpiB/f9Y Bz1RJxy4QzQ3/8Thh/ksSgK2PP9St7+kBjgxowe7YRuINCHMSFIpTZ7ALqvRsWa4fsM0 L2SQbEes3HySxpx0UXleYoGO/z8YDxb144fTAadC9JLZsME+Q9Vvpqk9pNJjZROyiG2x ohkHjZ/yh7siKNsGVa+L3eWsrHr3UwcajFSVto/1bvIhMVTUUhxR4rbpKc/lge1lA7IE mg6g== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amd.com header.s=selector1 header.b=lsffNqsJ; arc=pass (i=1 spf=pass spfdomain=amd.com dmarc=pass fromdomain=amd.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amd.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q102-20020a17090a17ef00b002409e4ae257si11469287pja.92.2023.04.17.16.50.17; Mon, 17 Apr 2023 16:50:31 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@amd.com header.s=selector1 header.b=lsffNqsJ; arc=pass (i=1 spf=pass spfdomain=amd.com dmarc=pass fromdomain=amd.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amd.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230264AbjDQXfC (ORCPT + 99 others); Mon, 17 Apr 2023 19:35:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57196 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230064AbjDQXfA (ORCPT ); Mon, 17 Apr 2023 19:35:00 -0400 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2041.outbound.protection.outlook.com [40.107.236.41]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8B6EB5BAB; Mon, 17 Apr 2023 16:34:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cQ5PMrMxsHyuL3hmcgWG0U8EhnKXjZ4CXz32ECRjN8BH0agthjLsWwseYxhC7xp2Dd5xEH+Z+QYcU5EuJosRchLwwKiRLhZZq//xkxCFNR7S+fluBUQQMEv7jEyrBqqQe07CVrVIaqjr3ge69U5Vq6Oqhl+4j7ySh1VrsKYA74D5AIdpG+b6vwrRnStSiZOeKPBXSEqLdSiSsU5Swx1Zi1K93QOaQp3QvOxd9lmD8GyCbpYYmYrsq1jikoQkFslQYxdO1sv5uecnEo8ZG1mLtrOanmv3ccXl4ZTeGVWEay+q6bZRcxkpQF+hs2Avnd8IZ/yUoaTUHasWvKknkumDbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=amRrXNdXe01eIp0BrIPD37BmK+wPf1VLsqKbRdfu66k=; b=mdJ3BxgdtKwj6O44tIrKrYKVZf4WhR91pgQlNqiOOgi1oLOFs6VzFeidc5BEvp5j3UU1y/eXWw/ep+sAWWqe/07a68LzbVW0bIm8BiSmGFCTDaJ0TwQN6Onndp8KRgX6bHysGSrYptXlcLECRJhKBBdn+K3gJJpijSp7u9u/tlDqzV5HGdhD8FMGfQCHEON/eEqR+5l9rYDwlmbnIcKr8WfW8gxVtqG6TRLnZUqIG0wOiKTWDOLFLofA4kmlUNHnb8bXgdAVMYw/3nY4BY36G1rMicleYaTB/LTqDRT3O18BzbHESwjlC1Q8Zdy9ImSmZMuhwKglhRxLYRe0Tzv/6A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=infradead.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=amRrXNdXe01eIp0BrIPD37BmK+wPf1VLsqKbRdfu66k=; b=lsffNqsJPezNuygZTArCzHE2jNSgTAEfHQfrUouZCPncZMWPfGrvZS3JEF5tEjKiIkotPo35EW9IxjY8Qqn7H1d5dxOdgZMEVuyoltaQwYmJsHTLKuVuWRYYGTWATJrC7DU5TVbGCYkNpzfmQu/CS2euYQTDg+FOqL5Jt+9FUsc= Received: from DM6PR13CA0054.namprd13.prod.outlook.com (2603:10b6:5:134::31) by CY5PR12MB6623.namprd12.prod.outlook.com (2603:10b6:930:41::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6298.45; Mon, 17 Apr 2023 23:34:34 +0000 Received: from DM6NAM11FT015.eop-nam11.prod.protection.outlook.com (2603:10b6:5:134:cafe::d1) by DM6PR13CA0054.outlook.office365.com (2603:10b6:5:134::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6319.19 via Frontend Transport; Mon, 17 Apr 2023 23:34:33 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by DM6NAM11FT015.mail.protection.outlook.com (10.13.172.133) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.6319.20 via Frontend Transport; Mon, 17 Apr 2023 23:34:33 +0000 Received: from [127.0.1.1] (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.34; Mon, 17 Apr 2023 18:34:31 -0500 Subject: [PATCH v4 3/7] x86/resctrl: Rename rftype flags for consistency From: Babu Moger To: , , , , CC: , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , Date: Mon, 17 Apr 2023 18:34:29 -0500 Message-ID: <168177446947.1758847.11380042804869155387.stgit@bmoger-ubuntu> In-Reply-To: <168177435378.1758847.8317743523931859131.stgit@bmoger-ubuntu> References: <168177435378.1758847.8317743523931859131.stgit@bmoger-ubuntu> User-Agent: StGit/1.1.dev103+g5369f4c MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6NAM11FT015:EE_|CY5PR12MB6623:EE_ X-MS-Office365-Filtering-Correlation-Id: f5126285-4197-49fc-49f0-08db3f9c4cc6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9MOEVPLXsSFQ4lvkzFbE1+2o0nKBwomacbNWdnS8CTHYRSXB9cOMV5l5dzjWVQP2hxD7CW06zwcShKbPNkTxGYPPTfU5qqEtFbWQejIZHtCQkyv+rOVRxp1kPpsJJ2XtFPnae2VncmDHwhJGrXhJNlv4tS1Mt6QB4zCk7WUU+aAZQEg9liQaP86ehiomFpUsZ818YE2kKPqsHKD4OavRafvqH2AlUPuB1mFphR4+/oc/abHdCk1yb9V/3qQ6mXPExswlHTVyvHt330ffyqD7WUzi7pnDV6exBOgIHa2mkjrEFSA2YCS9Ps5o0UeHSScOnrelGfKD4U3vDbrYpaWbbL3kXw6eA1M+Eqs0Y/2YwCeJABlRlx0when73HAMLnen9dG6c9WjIdnPkIJ1fOK2bD08UWbOokF/msHcNMaviRmZjHwvyuelQo1EnlrtSDlIuvREnsedCo3qSC/1OF1b+4wFRBIQDFrYD93vWd6EeObvUOQOrhrA/KH5turHxInxKzroel4hvIFITWlp+/LHVk9mFmtSByr/n0lCKTQ1zPbvmFvZDUmNWkonGgJ+G/FD5XHiSVrmvj7hPeMa0zG3IXsoBFiTLFUM9HeUIWkp3EJtmBy2R3F5VJLebo2EmOWiP56f5qJDU58yqmks9FPYmTnWBqxERXjNGAXT8i+SrpFxWOtYU45YRCTrPjL7cv8slfMyb1LLYKVpNi4HCPRYUdDQR0gBpamyfYO8cu3VT1JVgLMbSvExHT4CUXanUcmdRl7ob0cdtPPTqmz0PjO+QQ== X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230028)(7916004)(4636009)(346002)(376002)(39860400002)(136003)(396003)(451199021)(36840700001)(46966006)(40470700004)(83380400001)(47076005)(9686003)(426003)(336012)(36860700001)(26005)(478600001)(82310400005)(54906003)(110136005)(70586007)(70206006)(16576012)(4326008)(7406005)(316002)(44832011)(86362001)(16526019)(186003)(7416002)(41300700001)(8936002)(8676002)(5660300002)(2906002)(356005)(81166007)(82740400003)(40460700003)(33716001)(103116003)(40480700001)(71626016)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Apr 2023 23:34:33.7787 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f5126285-4197-49fc-49f0-08db3f9c4cc6 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT015.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR12MB6623 X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1763469355471580627?= X-GMAIL-MSGID: =?utf-8?q?1763469355471580627?= The rftype flags have two different prefixes even though they are used for the same purpose. Change the prefix to RFTYPE_ for all the flags. Signed-off-by: Babu Moger --- arch/x86/kernel/cpu/resctrl/internal.h | 8 +++--- arch/x86/kernel/cpu/resctrl/rdtgroup.c | 42 ++++++++++++++++---------------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/arch/x86/kernel/cpu/resctrl/internal.h b/arch/x86/kernel/cpu/resctrl/internal.h index 62767774810d..c4fc5a1c630c 100644 --- a/arch/x86/kernel/cpu/resctrl/internal.h +++ b/arch/x86/kernel/cpu/resctrl/internal.h @@ -248,10 +248,10 @@ struct rdtgroup { #define RFTYPE_TOP BIT(6) #define RFTYPE_RES_CACHE BIT(8) #define RFTYPE_RES_MB BIT(9) -#define RF_CTRL_INFO (RFTYPE_INFO | RFTYPE_CTRL) -#define RF_MON_INFO (RFTYPE_INFO | RFTYPE_MON) -#define RF_TOP_INFO (RFTYPE_INFO | RFTYPE_TOP) -#define RF_CTRL_BASE (RFTYPE_BASE | RFTYPE_CTRL) +#define RFTYPE_CTRL_INFO (RFTYPE_INFO | RFTYPE_CTRL) +#define RFTYPE_MON_INFO (RFTYPE_INFO | RFTYPE_MON) +#define RFTYPE_TOP_INFO (RFTYPE_INFO | RFTYPE_TOP) +#define RFTYPE_CTRL_BASE (RFTYPE_BASE | RFTYPE_CTRL) /* List of all resource groups */ extern struct list_head rdt_all_groups; diff --git a/arch/x86/kernel/cpu/resctrl/rdtgroup.c b/arch/x86/kernel/cpu/resctrl/rdtgroup.c index 6cd0a8396f30..719e29248892 100644 --- a/arch/x86/kernel/cpu/resctrl/rdtgroup.c +++ b/arch/x86/kernel/cpu/resctrl/rdtgroup.c @@ -1711,77 +1711,77 @@ static struct rftype res_common_files[] = { .mode = 0444, .kf_ops = &rdtgroup_kf_single_ops, .seq_show = rdt_last_cmd_status_show, - .fflags = RF_TOP_INFO, + .fflags = RFTYPE_TOP_INFO, }, { .name = "num_closids", .mode = 0444, .kf_ops = &rdtgroup_kf_single_ops, .seq_show = rdt_num_closids_show, - .fflags = RF_CTRL_INFO, + .fflags = RFTYPE_CTRL_INFO, }, { .name = "mon_features", .mode = 0444, .kf_ops = &rdtgroup_kf_single_ops, .seq_show = rdt_mon_features_show, - .fflags = RF_MON_INFO, + .fflags = RFTYPE_MON_INFO, }, { .name = "num_rmids", .mode = 0444, .kf_ops = &rdtgroup_kf_single_ops, .seq_show = rdt_num_rmids_show, - .fflags = RF_MON_INFO, + .fflags = RFTYPE_MON_INFO, }, { .name = "cbm_mask", .mode = 0444, .kf_ops = &rdtgroup_kf_single_ops, .seq_show = rdt_default_ctrl_show, - .fflags = RF_CTRL_INFO | RFTYPE_RES_CACHE, + .fflags = RFTYPE_CTRL_INFO | RFTYPE_RES_CACHE, }, { .name = "min_cbm_bits", .mode = 0444, .kf_ops = &rdtgroup_kf_single_ops, .seq_show = rdt_min_cbm_bits_show, - .fflags = RF_CTRL_INFO | RFTYPE_RES_CACHE, + .fflags = RFTYPE_CTRL_INFO | RFTYPE_RES_CACHE, }, { .name = "shareable_bits", .mode = 0444, .kf_ops = &rdtgroup_kf_single_ops, .seq_show = rdt_shareable_bits_show, - .fflags = RF_CTRL_INFO | RFTYPE_RES_CACHE, + .fflags = RFTYPE_CTRL_INFO | RFTYPE_RES_CACHE, }, { .name = "bit_usage", .mode = 0444, .kf_ops = &rdtgroup_kf_single_ops, .seq_show = rdt_bit_usage_show, - .fflags = RF_CTRL_INFO | RFTYPE_RES_CACHE, + .fflags = RFTYPE_CTRL_INFO | RFTYPE_RES_CACHE, }, { .name = "min_bandwidth", .mode = 0444, .kf_ops = &rdtgroup_kf_single_ops, .seq_show = rdt_min_bw_show, - .fflags = RF_CTRL_INFO | RFTYPE_RES_MB, + .fflags = RFTYPE_CTRL_INFO | RFTYPE_RES_MB, }, { .name = "bandwidth_gran", .mode = 0444, .kf_ops = &rdtgroup_kf_single_ops, .seq_show = rdt_bw_gran_show, - .fflags = RF_CTRL_INFO | RFTYPE_RES_MB, + .fflags = RFTYPE_CTRL_INFO | RFTYPE_RES_MB, }, { .name = "delay_linear", .mode = 0444, .kf_ops = &rdtgroup_kf_single_ops, .seq_show = rdt_delay_linear_show, - .fflags = RF_CTRL_INFO | RFTYPE_RES_MB, + .fflags = RFTYPE_CTRL_INFO | RFTYPE_RES_MB, }, /* * Platform specific which (if any) capabilities are provided by @@ -1800,7 +1800,7 @@ static struct rftype res_common_files[] = { .kf_ops = &rdtgroup_kf_single_ops, .write = max_threshold_occ_write, .seq_show = max_threshold_occ_show, - .fflags = RF_MON_INFO | RFTYPE_RES_CACHE, + .fflags = RFTYPE_MON_INFO | RFTYPE_RES_CACHE, }, { .name = "mbm_total_bytes_config", @@ -1847,7 +1847,7 @@ static struct rftype res_common_files[] = { .kf_ops = &rdtgroup_kf_single_ops, .write = rdtgroup_schemata_write, .seq_show = rdtgroup_schemata_show, - .fflags = RF_CTRL_BASE, + .fflags = RFTYPE_CTRL_BASE, }, { .name = "mode", @@ -1855,14 +1855,14 @@ static struct rftype res_common_files[] = { .kf_ops = &rdtgroup_kf_single_ops, .write = rdtgroup_mode_write, .seq_show = rdtgroup_mode_show, - .fflags = RF_CTRL_BASE, + .fflags = RFTYPE_CTRL_BASE, }, { .name = "size", .mode = 0444, .kf_ops = &rdtgroup_kf_single_ops, .seq_show = rdtgroup_size_show, - .fflags = RF_CTRL_BASE, + .fflags = RFTYPE_CTRL_BASE, }, }; @@ -1919,7 +1919,7 @@ void __init thread_throttle_mode_init(void) if (!rft) return; - rft->fflags = RF_CTRL_INFO | RFTYPE_RES_MB; + rft->fflags = RFTYPE_CTRL_INFO | RFTYPE_RES_MB; } void __init mbm_config_rftype_init(const char *config) @@ -1928,7 +1928,7 @@ void __init mbm_config_rftype_init(const char *config) rft = rdtgroup_get_rftype_by_name(config); if (rft) - rft->fflags = RF_MON_INFO | RFTYPE_RES_CACHE; + rft->fflags = RFTYPE_MON_INFO | RFTYPE_RES_CACHE; } /** @@ -2063,21 +2063,21 @@ static int rdtgroup_create_info_dir(struct kernfs_node *parent_kn) if (IS_ERR(kn_info)) return PTR_ERR(kn_info); - ret = rdtgroup_add_files(kn_info, RF_TOP_INFO); + ret = rdtgroup_add_files(kn_info, RFTYPE_TOP_INFO); if (ret) goto out_destroy; /* loop over enabled controls, these are all alloc_capable */ list_for_each_entry(s, &resctrl_schema_all, list) { r = s->res; - fflags = r->fflags | RF_CTRL_INFO; + fflags = r->fflags | RFTYPE_CTRL_INFO; ret = rdtgroup_mkdir_info_resdir(s, s->name, fflags); if (ret) goto out_destroy; } for_each_mon_capable_rdt_resource(r) { - fflags = r->fflags | RF_MON_INFO; + fflags = r->fflags | RFTYPE_MON_INFO; sprintf(name, "%s_MON", r->name); ret = rdtgroup_mkdir_info_resdir(r, name, fflags); if (ret) @@ -3578,7 +3578,7 @@ static int __init rdtgroup_setup_root(void) list_add(&rdtgroup_default.rdtgroup_list, &rdt_all_groups); - ret = rdtgroup_add_files(kernfs_root_to_node(rdt_root), RF_CTRL_BASE); + ret = rdtgroup_add_files(kernfs_root_to_node(rdt_root), RFTYPE_CTRL_BASE); if (ret) { kernfs_destroy_root(rdt_root); goto out;