diff options
| author | Remy Noel <mocramis@gmail.com> | 2018-02-25 17:36:21 +0100 |
|---|---|---|
| committer | Remy Noel <mocramis@gmail.com> | 2018-02-25 18:19:05 +0100 |
| commit | c8030a59c79846363587381a41f1d71f1bde5177 (patch) | |
| tree | 898d36fb4f5de32a8600a1d6be9c099b17210869 /arch/x86/machine/pmu_amd.c | |
| parent | cba7db6931932953fd0113a70019049234eb0b08 (diff) | |
| parent | 045500a2c88f4e6b877a4695908eb129340f6782 (diff) | |
Merge branch 'master' into perfmon
Diffstat (limited to 'arch/x86/machine/pmu_amd.c')
| -rw-r--r-- | arch/x86/machine/pmu_amd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/machine/pmu_amd.c b/arch/x86/machine/pmu_amd.c index 815f403..b8b4c78 100644 --- a/arch/x86/machine/pmu_amd.c +++ b/arch/x86/machine/pmu_amd.c @@ -132,7 +132,7 @@ pmu_amd_alloc(unsigned int *pmc_idp, unsigned int raw_event_id) pmu = pmu_amd_get(); if (pmu->pmc_bm == 0) - return ERROR_AGAIN; + return EAGAIN; pmc_id = __builtin_ffs(pmu->pmc_bm) - 1; pmu->pmc_bm &= ~(1U << pmc_id); @@ -208,7 +208,7 @@ pmu_amd_setup(void) /* Support AMD Family 10h processors and later */ if (cpu->family < 16) - return ERROR_NODEV; + return ENODEV; pmu = pmu_amd_get(); pmu->pmc_bm = (1U << PMU_AMD_NR_PMCS) - 1; |