]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
x86/resctrl: Fix types in resctrl_arch_mon_ctx_{alloc,free}() stubs
authorJames Morse <james.morse@arm.com>
Thu, 15 May 2025 16:58:48 +0000 (16:58 +0000)
committerBorislav Petkov (AMD) <bp@alien8.de>
Fri, 16 May 2025 10:10:51 +0000 (12:10 +0200)
resctrl_arch_mon_ctx_alloc() and resctrl_arch_mon_ctx_free() take an enum
resctrl_event_id that is already defined in resctrl_types.h to be
accessible to asm/resctrl.h.

The x86 stubs take an int. Fix that.

Signed-off-by: James Morse <james.morse@arm.com>
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Reviewed-by: Reinette Chatre <reinette.chatre@intel.com>
Reviewed-by: Fenghua Yu <fenghuay@nvidia.com>
Tested-by: Fenghua Yu <fenghuay@nvidia.com>
Tested-by: Babu Moger <babu.moger@amd.com>
Tested-by: Shaopeng Tan <tan.shaopeng@jp.fujitsu.com>
Tested-by: Tony Luck <tony.luck@intel.com>
Link: https://lore.kernel.org/20250515165855.31452-19-james.morse@arm.com
arch/x86/include/asm/resctrl.h

index 7a39728b074313ad2fc1366a0cd81fb78d1d0d2d..a2e20fe90a2cad7e0622320024f6ef3d7fa667ae 100644 (file)
@@ -194,14 +194,16 @@ static inline u32 resctrl_arch_rmid_idx_encode(u32 ignored, u32 rmid)
 
 /* x86 can always read an rmid, nothing needs allocating */
 struct rdt_resource;
-static inline void *resctrl_arch_mon_ctx_alloc(struct rdt_resource *r, int evtid)
+static inline void *resctrl_arch_mon_ctx_alloc(struct rdt_resource *r,
+                                              enum resctrl_event_id evtid)
 {
        might_sleep();
        return NULL;
-};
+}
 
-static inline void resctrl_arch_mon_ctx_free(struct rdt_resource *r, int evtid,
-                                            void *ctx) { };
+static inline void resctrl_arch_mon_ctx_free(struct rdt_resource *r,
+                                            enum resctrl_event_id evtid,
+                                            void *ctx) { }
 
 u64 resctrl_arch_get_prefetch_disable_bits(void);
 int resctrl_arch_pseudo_lock_fn(void *_plr);