summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXiao Liang <xiliang@redhat.com>2018-01-22 07:12:52 +0100
committerThomas Gleixner <tglx@linutronix.de>2018-01-24 13:00:35 +0100
commit40d4071ce2d20840d224b4a77b5dc6f752c9ab15 (patch)
treee1dc74b4bedf8dadbbebc8180126238e5130ceaa
parentMerge tag 'pci-v4.15-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff)
downloadlinux-40d4071ce2d20840d224b4a77b5dc6f752c9ab15.tar.xz
linux-40d4071ce2d20840d224b4a77b5dc6f752c9ab15.zip
perf/x86/amd/power: Do not load AMD power module on !AMD platforms
The AMD power module can be loaded on non AMD platforms, but unload fails with the following Oops: BUG: unable to handle kernel NULL pointer dereference at (null) IP: __list_del_entry_valid+0x29/0x90 Call Trace: perf_pmu_unregister+0x25/0xf0 amd_power_pmu_exit+0x1c/0xd23 [power] SyS_delete_module+0x1a8/0x2b0 ? exit_to_usermode_loop+0x8f/0xb0 entry_SYSCALL_64_fastpath+0x20/0x83 Return -ENODEV instead of 0 from the module init function if the CPU does not match. Fixes: c7ab62bfbe0e ("perf/x86/amd/power: Add AMD accumulated power reporting mechanism") Signed-off-by: Xiao Liang <xiliang@redhat.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Cc: stable@vger.kernel.org Link: https://lkml.kernel.org/r/20180122061252.6394-1-xiliang@redhat.com
-rw-r--r--arch/x86/events/amd/power.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/events/amd/power.c b/arch/x86/events/amd/power.c
index a6eee5ac4f58..2aefacf5c5b2 100644
--- a/arch/x86/events/amd/power.c
+++ b/arch/x86/events/amd/power.c
@@ -277,7 +277,7 @@ static int __init amd_power_pmu_init(void)
int ret;
if (!x86_match_cpu(cpu_match))
- return 0;
+ return -ENODEV;
if (!boot_cpu_has(X86_FEATURE_ACC_POWER))
return -ENODEV;