Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 147227
b: refs/heads/master
c: 742bd95
h: refs/heads/master
i:
  147225: 5473f60
  147223: ad0ca2d
v: v3
  • Loading branch information
Paul Mackerras committed Feb 26, 2009
1 parent 3eb1e9d commit 0f1cd07
Show file tree
Hide file tree
Showing 4 changed files with 482 additions and 2 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: d095cd46dac104e4d2a4967c7c19b55a12f78240
refs/heads/master: 742bd95ba96e19b3f7196c3a0834ebc17c8ba006
3 changes: 2 additions & 1 deletion trunk/arch/powerpc/kernel/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,8 @@ obj-$(CONFIG_AUDIT) += audit.o
obj64-$(CONFIG_AUDIT) += compat_audit.o

obj-$(CONFIG_DYNAMIC_FTRACE) += ftrace.o
obj-$(CONFIG_PERF_COUNTERS) += perf_counter.o ppc970-pmu.o power6-pmu.o
obj-$(CONFIG_PERF_COUNTERS) += perf_counter.o ppc970-pmu.o power5-pmu.o \
power6-pmu.o

obj-$(CONFIG_8XX_MINIMAL_FPEMU) += softemu8xx.o

Expand Down
4 changes: 4 additions & 0 deletions trunk/arch/powerpc/kernel/perf_counter.c
Original file line number Diff line number Diff line change
Expand Up @@ -824,6 +824,7 @@ void hw_perf_counter_setup(int cpu)
}

extern struct power_pmu ppc970_pmu;
extern struct power_pmu power5_pmu;
extern struct power_pmu power6_pmu;

static int init_perf_counters(void)
Expand All @@ -843,6 +844,9 @@ static int init_perf_counters(void)
case PV_970MP:
ppmu = &ppc970_pmu;
break;
case PV_POWER5:
ppmu = &power5_pmu;
break;
case 0x3e:
ppmu = &power6_pmu;
break;
Expand Down
Loading

0 comments on commit 0f1cd07

Please sign in to comment.