Commit efa8f11a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'perf-urgent-2024-06-02' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull perf events fix from Ingo Molnar:
 "Add missing MODULE_DESCRIPTION() lines"

* tag 'perf-urgent-2024-06-02' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf/x86/intel: Add missing MODULE_DESCRIPTION() lines
  perf/x86/rapl: Add missing MODULE_DESCRIPTION() line
parents 00a8c352 dc8e5dfb

arch/x86/events/intel/cstate.c

+1 −0
Original line number Diff line number Diff line
@@ -114,6 +114,7 @@ 
#include "../perf_event.h"

#include "../probe.h"



MODULE_DESCRIPTION("Support for Intel cstate performance events");

MODULE_LICENSE("GPL");



#define DEFINE_CSTATE_FORMAT_ATTR(_var, _name, _format)		\

arch/x86/events/intel/uncore.c

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ static struct event_constraint uncore_constraint_fixed = 
struct event_constraint uncore_constraint_empty =

	EVENT_CONSTRAINT(0, 0, 0);



MODULE_DESCRIPTION("Support for Intel uncore performance events");

MODULE_LICENSE("GPL");



int uncore_pcibus_to_dieid(struct pci_bus *bus)

arch/x86/events/rapl.c

+1 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ 
#include "perf_event.h"

#include "probe.h"



MODULE_DESCRIPTION("Support Intel/AMD RAPL energy consumption counters");

MODULE_LICENSE("GPL");



/*