Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 339537
b: refs/heads/master
c: 0305230
h: refs/heads/master
i:
  339535: 2ac2e61
v: v3
  • Loading branch information
Will Deacon committed Nov 9, 2012
1 parent 0c497b5 commit 1003fb2
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 288700d16d4c1479aa00e3db13caed8bb7c83e9f
refs/heads/master: 0305230a3d92d6829db89c9e0c096d4d8733f317
2 changes: 1 addition & 1 deletion trunk/arch/arm/include/asm/pmu.h
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ struct arm_pmu {

extern const struct dev_pm_ops armpmu_dev_pm_ops;

int armpmu_register(struct arm_pmu *armpmu, char *name, int type);
int armpmu_register(struct arm_pmu *armpmu, int type);

u64 armpmu_event_update(struct perf_event *event);

Expand Down
4 changes: 2 additions & 2 deletions trunk/arch/arm/kernel/perf_event.c
Original file line number Diff line number Diff line change
Expand Up @@ -511,12 +511,12 @@ static void __init armpmu_init(struct arm_pmu *armpmu)
};
}

int armpmu_register(struct arm_pmu *armpmu, char *name, int type)
int armpmu_register(struct arm_pmu *armpmu, int type)
{
armpmu_init(armpmu);
pr_info("enabled with %s PMU driver, %d counters available\n",
armpmu->name, armpmu->num_events);
return perf_pmu_register(&armpmu->pmu, name, type);
return perf_pmu_register(&armpmu->pmu, armpmu->name, type);
}

/*
Expand Down
4 changes: 2 additions & 2 deletions trunk/arch/arm/kernel/perf_event_cpu.c
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ const char *perf_pmu_name(void)
if (!cpu_pmu)
return NULL;

return cpu_pmu->pmu.name;
return cpu_pmu->name;
}
EXPORT_SYMBOL_GPL(perf_pmu_name);

Expand Down Expand Up @@ -287,7 +287,7 @@ static int __devinit cpu_pmu_device_probe(struct platform_device *pdev)
cpu_pmu = pmu;
cpu_pmu->plat_device = pdev;
cpu_pmu_init(cpu_pmu);
armpmu_register(cpu_pmu, cpu_pmu->name, PERF_TYPE_RAW);
armpmu_register(cpu_pmu, PERF_TYPE_RAW);

return 0;
}
Expand Down

0 comments on commit 1003fb2

Please sign in to comment.