diff options
Diffstat (limited to 'arch/sh/kernel/perf_event.c')
| -rw-r--r-- | arch/sh/kernel/perf_event.c | 8 | 
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/sh/kernel/perf_event.c b/arch/sh/kernel/perf_event.c index b9cefebda55..02331672b6d 100644 --- a/arch/sh/kernel/perf_event.c +++ b/arch/sh/kernel/perf_event.c @@ -227,7 +227,7 @@ again:  static void sh_pmu_stop(struct perf_event *event, int flags)  { -	struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events); +	struct cpu_hw_events *cpuc = this_cpu_ptr(&cpu_hw_events);  	struct hw_perf_event *hwc = &event->hw;  	int idx = hwc->idx; @@ -245,7 +245,7 @@ static void sh_pmu_stop(struct perf_event *event, int flags)  static void sh_pmu_start(struct perf_event *event, int flags)  { -	struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events); +	struct cpu_hw_events *cpuc = this_cpu_ptr(&cpu_hw_events);  	struct hw_perf_event *hwc = &event->hw;  	int idx = hwc->idx; @@ -262,7 +262,7 @@ static void sh_pmu_start(struct perf_event *event, int flags)  static void sh_pmu_del(struct perf_event *event, int flags)  { -	struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events); +	struct cpu_hw_events *cpuc = this_cpu_ptr(&cpu_hw_events);  	sh_pmu_stop(event, PERF_EF_UPDATE);  	__clear_bit(event->hw.idx, cpuc->used_mask); @@ -272,7 +272,7 @@ static void sh_pmu_del(struct perf_event *event, int flags)  static int sh_pmu_add(struct perf_event *event, int flags)  { -	struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events); +	struct cpu_hw_events *cpuc = this_cpu_ptr(&cpu_hw_events);  	struct hw_perf_event *hwc = &event->hw;  	int idx = hwc->idx;  	int ret = -EAGAIN;  | 
