diff options
| author | Alex Shi <alex.shi@linaro.org> | 2018-02-01 12:03:41 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2018-02-01 12:03:41 +0800 |
| commit | 9cebd248bd83dea5ead3f1ab5f3cbaf241588e37 (patch) | |
| tree | 5f2d8fd7122c345045c476d57cb7c5ad17a4f08b /arch/x86/events/amd/power.c | |
| parent | 4f0ca2b2718d297c88b1c303f2d414327c537636 (diff) | |
| parent | 6c6f924f9c6294944ee6efb1bbd8cdb853582e50 (diff) | |
Merge tag 'v4.9.79' into linux-linaro-lsk-v4.9lsk-v4.9-18.02
This is the 4.9.79 stable release
Diffstat (limited to 'arch/x86/events/amd/power.c')
| -rw-r--r-- | arch/x86/events/amd/power.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/events/amd/power.c b/arch/x86/events/amd/power.c index 9842270ed2f2..21a4e4127f43 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; |