Add the exit function and allow the driver to be built as module.
Signed-off-by: Thomas Gleixner <[email protected]>
---
arch/x86/Kconfig.perf | 8 ++++++++
arch/x86/events/intel/Makefile | 4 +++-
arch/x86/events/intel/cstate.c | 22 +++++++++++++++++++---
3 files changed, 30 insertions(+), 4 deletions(-)
--- a/arch/x86/Kconfig.perf
+++ b/arch/x86/Kconfig.perf
@@ -16,4 +16,12 @@ config PERF_EVENTS_INTEL_RAPL
Include support for Intel rapl performance events for power
monitoring on modern processors.
+config PERF_EVENTS_INTEL_CSTATE
+ tristate "Intel cstate performance events"
+ depends on PERF_EVENTS && CPU_SUP_INTEL && PCI
+ default y
+ ---help---
+ Include support for Intel cstate performance events for power
+ monitoring on modern processors.
+
endmenu
--- a/arch/x86/events/intel/Makefile
+++ b/arch/x86/events/intel/Makefile
@@ -1,7 +1,9 @@
obj-$(CONFIG_CPU_SUP_INTEL) += core.o bts.o cqm.o
-obj-$(CONFIG_CPU_SUP_INTEL) += cstate.o ds.o knc.o
+obj-$(CONFIG_CPU_SUP_INTEL) += ds.o knc.o
obj-$(CONFIG_CPU_SUP_INTEL) += lbr.o p4.o p6.o pt.o
obj-$(CONFIG_PERF_EVENTS_INTEL_RAPL) += intel-rapl.o
intel-rapl-objs := rapl.o
obj-$(CONFIG_PERF_EVENTS_INTEL_UNCORE) += intel-uncore.o
intel-uncore-objs := uncore.o uncore_nhmex.o uncore_snb.o
uncore_snbep.o
+obj-$(CONFIG_PERF_EVENTS_INTEL_CSTATE) += intel-cstate.o
+intel-cstate-objs := cstate.o
--- a/arch/x86/events/intel/cstate.c
+++ b/arch/x86/events/intel/cstate.c
@@ -91,6 +91,8 @@
#include <asm/cpu_device_id.h>
#include "../perf_event.h"
+MODULE_LICENSE("GPL");
+
#define DEFINE_CSTATE_FORMAT_ATTR(_var, _name, _format) \
static ssize_t __cstate_##_var##_show(struct kobject *kobj, \
struct kobj_attribute *attr, \
@@ -429,6 +431,11 @@ static int cstate_cpu_notifier(struct no
return NOTIFY_OK;
}
+static struct notifier_block cstate_cpu_nb = {
+ .notifier_call = cstate_cpu_notifier,
+ .priority = CPU_PRI_PERF + 1,
+};
+
static struct pmu cstate_core_pmu = {
.attr_groups = core_attr_groups,
.name = "cstate_core",
@@ -574,7 +581,7 @@ static int __init cstate_probe(const str
return (has_cstate_core || has_cstate_pkg) ? 0 : -ENODEV;
}
-static void __init cstate_cleanup(void)
+static inline void cstate_cleanup(void)
{
if (has_cstate_core)
perf_pmu_unregister(&cstate_core_pmu);
@@ -609,7 +616,7 @@ static int __init cstate_init(void)
goto out;
}
}
- __perf_cpu_notifier(cstate_cpu_notifier);
+ __register_cpu_notifier(&cstate_cpu_nb);
out:
cpu_notifier_register_done();
return err;
@@ -633,4 +640,13 @@ static int __init cstate_pmu_init(void)
return cstate_init();
}
-device_initcall(cstate_pmu_init);
+module_init(cstate_pmu_init);
+
+static void __exit cstate_pmu_exit(void)
+{
+ cpu_notifier_register_begin();
+ __unregister_cpu_notifier(&cstate_cpu_nb);
+ cstate_cleanup();
+ cpu_notifier_register_done();
+}
+module_exit(cstate_pmu_exit);
