Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux...

[karo-tx-linux.git] / arch / powerpc / perf / hv-common.c

diff --git a/arch/powerpc/perf/hv-common.c b/arch/powerpc/perf/hv-common.c
index 47e02b366f58f42635245972a56d8a056e34f8dc..7dce8f1099675dc1bb7fe63d672b12d4f0c05cbe 100644 (file)
--- a/arch/powerpc/perf/hv-common.c
+++ b/arch/powerpc/perf/hv-common.c
@@ -9,13 +9,13 @@ unsigned long hv_perf_caps_get(struct hv_perf_caps *caps)
        unsigned long r;
        struct p {
                struct hv_get_perf_counter_info_params params;
-               struct cv_system_performance_capabilities caps;
+               struct hv_gpci_system_performance_capabilities caps;
        } __packed __aligned(sizeof(uint64_t));
 
        struct p arg = {
                .params = {
                        .counter_request = cpu_to_be32(
-                                       CIR_SYSTEM_PERFORMANCE_CAPABILITIES),
+                               HV_GPCI_system_performance_capabilities),
                        .starting_index = cpu_to_be32(-1),
                        .counter_info_version_in = 0,
                }
@@ -31,9 +31,9 @@ unsigned long hv_perf_caps_get(struct hv_perf_caps *caps)
 
        caps->version = arg.params.counter_info_version_out;
        caps->collect_privileged = !!arg.caps.perf_collect_privileged;
-       caps->ga = !!(arg.caps.capability_mask & CV_CM_GA);
-       caps->expanded = !!(arg.caps.capability_mask & CV_CM_EXPANDED);
-       caps->lab = !!(arg.caps.capability_mask & CV_CM_LAB);
+       caps->ga = !!(arg.caps.capability_mask & HV_GPCI_CM_GA);
+       caps->expanded = !!(arg.caps.capability_mask & HV_GPCI_CM_EXPANDED);
+       caps->lab = !!(arg.caps.capability_mask & HV_GPCI_CM_LAB);
 
        return r;
 }