Commit 272ed1c2 authored by James Morse's avatar James Morse Committed by Borislav Petkov (AMD)
Browse files

x86/resctrl: Fix types in resctrl_arch_mon_ctx_{alloc,free}() stubs 



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: default avatarJames Morse <james.morse@arm.com>
Signed-off-by: default avatarBorislav Petkov (AMD) <bp@alien8.de>
Reviewed-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Reviewed-by: default avatarFenghua Yu <fenghuay@nvidia.com>
Tested-by: default avatarFenghua Yu <fenghuay@nvidia.com>
Tested-by: default avatarBabu Moger <babu.moger@amd.com>
Tested-by: default avatarShaopeng Tan <tan.shaopeng@jp.fujitsu.com>
Tested-by: default avatarTony Luck <tony.luck@intel.com>
Link: https://lore.kernel.org/20250515165855.31452-19-james.morse@arm.com
parent 7bdb619c

arch/x86/include/asm/resctrl.h

+6 −4
Original line number Diff line number Diff line
@@ -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);