tile: Use this_cpu_ptr() for hardware counters (81829a96) · Commits · e / devices / android_kernel_teracube_2e

arch/tile/kernel/perf_event.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -590,7 +590,7 @@ static int tile_event_set_period(struct perf_event *event)
		*/
		static void tile_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;

		@@ -616,7 +616,7 @@ static void tile_pmu_stop(struct perf_event *event, int flags)
		*/
		static void tile_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);
		int idx = event->hw.idx;

		if (WARN_ON_ONCE(!(event->hw.state & PERF_HES_STOPPED)))
		@@ -650,7 +650,7 @@ static void tile_pmu_start(struct perf_event *event, int flags)
		*/
		static int tile_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;
		unsigned long mask;
		int b, max_cnt;
		@@ -706,7 +706,7 @@ static int tile_pmu_add(struct perf_event *event, int flags)
		*/
		static void tile_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);
		int i;

		/*
		@@ -880,14 +880,14 @@ static struct pmu tilera_pmu = {
		int tile_pmu_handle_irq(struct pt_regs *regs, int fault)
		{
		struct perf_sample_data data;
		struct cpu_hw_events *cpuc = &__get_cpu_var(cpu_hw_events);
		struct cpu_hw_events *cpuc = this_cpu_ptr(&cpu_hw_events);
		struct perf_event *event;
		struct hw_perf_event *hwc;
		u64 val;
		unsigned long status;
		int bit;

		__get_cpu_var(perf_irqs)++;
		__this_cpu_inc(perf_irqs);

		if (!atomic_read(&tile_active_events))
		return 0;